Commit b2b9afe9 authored by yPhil's avatar yPhil
Browse files

Feed prefs menu select finally behaving (legend out of fieldset)

parent dec4e786
This diff is collapsed.
......@@ -40,6 +40,7 @@
},
"devDependencies": {
"mocha": "^8.3.0",
"should": "^13.2.3"
"should": "^13.2.3",
"uglify-js": "^3.12.8"
}
}
......@@ -705,7 +705,7 @@ i.tab-icon {
margin: 0;
}
button#feed-guess {
button#feedGuessButton {
margin-left: 0.4em;
}
......@@ -745,8 +745,7 @@ fieldset {
flex: 1 0 auto !important;
}
#console:hover,
#feedGroup:focus {
#console:hover {
border: 3px solid var(--color-ui-sec);
}
......
......@@ -5,7 +5,7 @@
--color-fg4: #404552; /* Separators */
--color-fg5: #F77F00; /* Feed controls */
--color-fg6: #eae2b7; /* Feed title */
--color-bg1: #29323C; /* Body / Feed border */
--color-bg1: #29323C; /* Body / Feed border */
--color-bg2: #1F262E; /* Feed header */
--color-bg3: #383C4A; /* Feed item BG */
--color-bg4: #424657; /* Feed item BG alternate */
......
......@@ -261,12 +261,12 @@ PTL.util = {
position: 'bottom'
},
{
element: 'button#feed-guess',
element: 'button#feedGuessButton',
intro: PTL.tr('Find the feed of this website, or build a new one from the search terms.'),
position: 'left'
},
{
element: 'fieldset#feedGroup',
element: 'fieldset#feedGroupFieldset',
intro: PTL.tr('Move this feed to another group.'),
position: 'bottom'
},
......
<div id="feedPrefs">
<form>
<legend data-content="Location"
class="ui-corner-top translate">Location</legend>
<fieldset class="ui-widget ui-widget-content ui-corner-all">
<legend data-content="Location"
class="ui-corner-top translate">Location</legend>
<div id="feed-guess" class="flex-box">
<div class="flex-box">
<input name="guess"
id="feed-guess"
placeholder="URL (https://reddit.com)"
......@@ -12,7 +11,7 @@
value=""
class="ui-widget-content grow ui-corner-all translate"
/>
<button id="feed-guess"
<button id="feedGuessButton"
data-title="Find the feed for this URL, or build a new one from the search query"
class="shrink translate last"
type="button">
......@@ -22,11 +21,10 @@
</fieldset>
<fieldset id="feedGroup" class="prefsForm ui-widget ui-widget-content ui-corner-all">
<legend data-content="Group"
class="ui-corner-top translate">Group
</legend>
<legend data-content="Group"
class="ui-corner-top translate">Group
</legend>
<fieldset id="feedGroupFieldset" class="prefsForm ui-widget ui-widget-content ui-corner-all">
<select id="feedGroup"
class="unique translate"
......@@ -36,13 +34,12 @@
</fieldset>
<legend data-content="Type"
class="ui-corner-top translate">
Type
</legend>
<fieldset id="feedType" class="prefsForm ui-widget ui-widget-content ui-corner-all">
<legend data-content="Type"
class="ui-corner-top translate">
Type
</legend>
<div id="feedType"
class="flex-box">
......@@ -67,9 +64,9 @@
</div>
</fieldset>
<legend data-content="Items"
class="ui-corner-top translate">Items</legend>
<fieldset id="feedLimit" class="ui-widget ui-widget-content ui-corner-all">
<legend data-content="Items"
class="ui-corner-top translate">Items</legend>
<div class="flex-box translate"
data-title="Number of items displayed in this feed">
<div class="feedLimit grow">
......@@ -86,12 +83,11 @@
</fieldset>
<legend data-content="Delete"
class="ui-corner-top translate">Delete
</legend>
<fieldset id="kill-feed" class="prefsForm ui-widget ui-widget-content ui-corner-all">
<legend data-content="Delete"
class="ui-corner-top translate">Delete
</legend>
<div id="feedDel"
class="flex-box">
<input type="checkbox" name="kill-feed-check" id="kill-feed-check">
......
......@@ -6,6 +6,8 @@
<meta charset="UTF-8">
<link rel="preload" as="script" href="/bower/jquery/dist/jquery.min.js">
<link rel="preload" as="script" href="/bower/jquery-ui/jquery-ui.min.js">
<link rel="preload" as="font" crossorigin href="/static/font/BebasNeue.otf">
<link rel="preload" as="font" crossorigin href="/static/font/Lobster.otf">
......@@ -73,91 +75,14 @@
<script src="/bower/jquery/dist/jquery.min.js"></script>
<!-- <script src="/bower/jquery-ui/jquery-ui.js"></script>
-->
<!-- <script src="/bower/jquery-ui/ui/core.js"></script>
-->
<script src="/bower/jquery-ui/ui/version.js"></script>
<script src="/bower/jquery-ui/ui/data.js"></script>
<script src="/bower/jquery-ui/ui/disable-selection.js"></script>
<script src="/bower/jquery-ui/ui/focusable.js"></script>
<script src="/bower/jquery-ui/ui/form.js"></script>
<script src="/bower/jquery-ui/ui/ie.js"></script>
<script src="/bower/jquery-ui/ui/keycode.js"></script>
<script src="/bower/jquery-ui/ui/labels.js"></script>
<!-- <script src="/bower/jquery-ui/ui/jquery-1-7.js"></script> -->
<script src="/bower/jquery-ui/ui/plugin.js"></script>
<script src="/bower/jquery-ui/ui/safe-active-element.js"></script>
<script src="/bower/jquery-ui/ui/safe-blur.js"></script>
<script src="/bower/jquery-ui/ui/scroll-parent.js"></script>
<script src="/bower/jquery-ui/ui/tabbable.js"></script>
<script src="/bower/jquery-ui/ui/unique-id.js"></script>
<script src="/bower/jquery-ui/ui/position.js"></script>
<script src="/bower/jquery-ui/ui/form-reset-mixin.js"></script>
<script src="/bower/jquery-ui/ui/effect.js"></script>
<!-- <script src="/bower/jquery-ui/ui/effects/effect-blind.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-bounce.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-clip.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-drop.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-explode.js"></script> -->
<script src="/bower/jquery-ui/ui/effects/effect-fade.js"></script>
<!-- <script src="/bower/jquery-ui/ui/effects/effect-fold.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-highlight.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-puff.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-pulsate.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-scale.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-shake.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-size.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-slide.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/effects/effect-transfer.js"></script>
-->
<script src="/bower/jquery-ui/ui/widget.js"></script>
<!-- <script src="/bower/jquery-ui/ui/widgets/accordion.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/widgets/autocomplete.js"></script> -->
<script src="/bower/jquery-ui/ui/widgets/button.js"></script>
<script src="/bower/jquery-ui/ui/widgets/checkboxradio.js"></script>
<!-- <script src="/bower/jquery-ui/ui/widgets/controlgroup.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/widgets/datepicker.js"></script> -->
<script src="/bower/jquery-ui/ui/widgets/dialog.js"></script>
<script src="/bower/jquery-ui/ui/widgets/droppable.js"></script>
<!-- <script src="/bower/jquery-ui/ui/widgets/menu.js"></script> -->
<script src="/bower/jquery-ui/ui/widgets/mouse.js"></script>
<script src="/bower/jquery-ui/ui/widgets/progressbar.js"></script>
<script src="/bower/jquery-ui/ui/widgets/resizable.js"></script>
<!-- <script src="/bower/jquery-ui/ui/widgets/selectable.js"></script> -->
<!-- <script src="/bower/jquery-ui/ui/widgets/selectmenu.js"></script> -->
<script src="/bower/jquery-ui/ui/widgets/slider.js"></script>
<script src="/bower/jquery-ui/ui/widgets/sortable.js"></script>
<script src="/bower/jquery-ui/ui/widgets/spinner.js"></script>
<script src="/bower/jquery-ui/ui/widgets/tabs.js"></script>
<!-- <script src="/bower/jquery-ui/ui/widgets/tooltip.js"></script> -->
<script src="/bower/jquery-ui/ui/widgets/draggable.js"></script>
<!--
<script src="/bower/jquery-ui/ui/escape-selector.js"></script>
<script src="/bower/jquery-ui/ui/form.js"></script>
<script src="/bower/jquery-ui/ui/ie.js"></script>
<script src="/bower/jquery-ui/ui/plugin.js"></script>
<script src="/bower/jquery-ui/ui/safe-active-element.js"></script>
<script src="/bower/jquery-ui/ui/safe-blur.js"></script>
<script src="/bower/jquery-ui/ui/version.js"></script>
-->
<link rel="preload" href="/bower/jquery-ui/jquery-ui.min.js" as="script">
<script src="/bower/jquery-ui/jquery-ui.min.js"></script>
<script src="/bower/intro.js/dist/minified/intro.min.js"></script>
<script src="/bower/fancybox/dist/jquery.fancybox.min.js"></script>
<script src="/bower/remotestorage/release/remotestorage.js"></script>
<script src="/bower/rs-widget/build/widget.js"></script>
<script src="/bower/bLazy/blazy.js"></script>
<script src="/static/js/PTL.main.js"></script>
<script src="/static/js/PTL.prefs.js"></script>
<script src="/static/js/PTL.i18n.js"></script>
......@@ -541,8 +466,6 @@
}, 60000);
})();
var bLazy = new Blazy();
});
</script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment