simplified styling

svn path=/trunk/; revision=148

diff --git a/static/common.css b/static/common.css
index 16910fb12d5603836f27a9b73a98dd39fcd72d7b..e6de713b632779c9205bb87b3c5db8df9f86e4d7 100644 (file)
--- a/static/common.css
+++ b/static/common.css
@@ -19,8 +19,8 @@
 * {
   -moz-box-sizing: border-box;
   box-sizing: border-box;
-  -moz-transition: all .3s linear;
-  transition: all .3s linear;
+  -moz-transition: all .25s linear;
+  transition: all .25s linear;
 }
 
 body {
@@ -63,7 +63,6 @@ textarea {
   background-color: #333;
   text-align: right;
 }
-.panel:after { content: ''; display: block; clear: both;}
 .pagination_nav a {
   display: none;
   text-decoration: none;
@@ -93,106 +92,92 @@ textarea {
 }
 .pagination_nav:hover a { display: inline; }
 
+
 /* == Panels == */
 
-.panel {
-  position: relative;
+.panel#search select { margin-right: .5em; }
+.panel#search:after {
+  display: block; content: '';
+  clear: both;
+}
+
+.panel#search, .panel#foot,
+.panel.top, .panel.bottom {
   display: block;
   width: 100%;
   margin: 0;
   padding: .25em .5em;
   background-color: #333;
   border-width: 1px;
-  border-style: none none solid none;
-}
-
-a.panel {
-  font-weight: bold;
-  display: inline-block;
-  border: none;
-  width: auto;
-  padding: 0;
-  margin: auto 1em 1ex 0;
-  text-decoration: none;
-}
-
-.panel .help { display: block;}
-
-/* == Top Panel == */
-
-.panel.switchable.top {
-  position: absolute;
-  top: 0;
+  z-index: 1;
 }
 
-body.playctl .panel#advfilter,
-body.playctl .panel#morelinks,
-body.playctl .panel#search {
-  margin-top: 1.25em;
-  border-top: 1px solid #FFF;
+.panel#search, .panel.top {
+  position: relative; top: 0;
+  border-style: none none solid none;
 }
-
-.panel#search select { margin-right: .5em; }
-
-/* == Bottom Panels == */
-.panel.bottom,
-.panel#foot {
+.panel.top.switchable { position: absolute; }
+.panel#foot, .panel.bottom {
   position: fixed;
-  bottom: 0px;
+  bottom: 0;
   border-style: solid none none none;
 }
 
-/* == Switchable Panels == */
-
 .panel.switchable {
-  z-index: 1;
+  max-height: 0;
   overflow: hidden;
-  min-height: 0; max-height: 0;
-  padding-top: 0; padding-bottom: 0;
+  margin: 0; padding: 0;
+  border-width: 0;
 }
 .panel.switchable:target {
-  max-height: 100%;
+  max-height: 80%;
   overflow-y: scroll;
-}
-.panel.switchable.top:target{ padding-bottom: 1em; }
-
-.panel#search,
-.panel#foot {
-  max-height: 100%;
-  z-index: 0;
-  padding: .25em .5em 0 .5em;
-  overflow: visible;
+  padding: .25em .5em;
+  border-width: 1px;
+  z-index: 2;
 }
 
 body.playctl .panel#search,
-body.playctl .panel#foot { padding-right: .25em; }
-
+body.playctl .panel.top {
+  margin-top: 1.25em;
+  border-top: 1px solid #FFF;
+}
 
-/* == Panel Switches == */
+.panel#search > a, .panel#foot > a,
+.panel.top > a, .panel.bottom > a{
+  display: inline-block;
+  font-weight: bold;
+  text-decoration: none;
+  margin: .25em .5em 0 0;
+}
 
-.panel.switchable.bottom a.panel:last-of-type,
-.panel.switchable.top a.panel:first-of-type {
+.panel.switchable.top a:first-of-type {
   display: block;
-  border-style: none none solid none;
-  border-width: 1px;
+  margin-bottom: .5em;
+  border-bottom: 1px solid #FFF;
 }
-.panel.switchable.bottom a.panel:last-of-type {
-  border-style: solid none none none;
+.panel.switchable.bottom a:last-of-type {
+  display: block;
   margin-top: .5em;
+  border-top: 1px solid #FFF;
 }
 
 
 /* == Panel Elements == */
 
-.panel#advfilter .filter,
-.panel#tagger .newtag,
-.panel#tagger input[type=submit],
-.panel#preferences > * {
+.panel.switchable > fieldset,
+.panel.switchable > input[type=submit] {
+  border: none;
   display: inline-block;
   vertical-align: top;
   margin-top: 1em;
+  max-width: 48%;
 }
 
+.panel.switchable > fieldset.additional,
+.panel.switchable > fieldset.description {
+  max-width: 100%;
+}
 
 /* == Advanced Filters == */
 

diff --git a/templates/advfilter.html.sh b/templates/advfilter.html.sh
index fb56645d09ea51735545597a9a9b2f2986828fe5..5d27f3b71ead367e2b14959137b91fab0780e2eb 100755 (executable)
--- a/templates/advfilter.html.sh
+++ b/templates/advfilter.html.sh
@@ -42,7 +42,7 @@ filterbox(){
     cat <<-EOF
        <input class="tabhandle" type="checkbox" id="filter$n" $([ $n = 0 -o -n "$filter" ] && printf checked) >
        <label class="tabhandle filter" for="filter$n">+ and</label>
-       <div class="tabcontent filter">
+       <fieldset class="tabcontent filter">
          <input type="radio" name="type$n" value="pos" id="pos$n" ${fneg:-checked} ><label for="pos$n" class="conjunction">Any</label>
          <input type="radio" name="type$n" value="neg" id="neg$n" ${fneg:+checked} ><label for="neg$n" class="conjunction">None</label>
          <span class="help">of the items selected here:</span>
@@ -51,7 +51,7 @@ filterbox(){
          <div class="category tabcontainer">
            $(category_tabs $(list_categories) )
          </div>
-       </div>
+       </fieldset>
        EOF
   done
 }
@@ -65,7 +65,7 @@ cat <<EOF
     <p class="help">Up to <strong>10</strong> filter boxes will appear as you start selecting tags. You can select <strong>multiple</strong> tags in each box by holding down the <strong>Ctrl</strong>-key. Click the "<strong>Filter!</strong>" button when you are ready.</p>
     $(filterbox {0..9})
 
-    <p class="filter final">
+    <fieldset class="filter final">
       <label for="o3" class="order">Order by:</label>
       <select class="edit order" size="1" name="o" id="o3">
         <option $([ "${_GET[o]}" = Name ] && printf selected) >Name</option>
@@ -73,7 +73,7 @@ cat <<EOF
         <option $([ "${_GET[o]}" = Length ] && printf selected) >Length</option>
       </select>
       <input type="submit" value="Filter!">
-    </p>
+    </fieldset>
   </form>
 EOF
 

diff --git a/templates/playctl.html.sh b/templates/playctl.html.sh
index a8a14a19b7b51d8f01388eafceaf9fa213635d9f..ad1ed9346e9b43e7bf41283da5ee2b080e4555da 100755 (executable)
--- a/templates/playctl.html.sh
+++ b/templates/playctl.html.sh
@@ -79,7 +79,7 @@ cat <<EOF
 
   $(
   for cat in $(list_categories); do
-    printf '<p class="newtag"><label class="category">%s:</label><select name="tag" size="12" multiple>' "${cat}"
+    printf '<fieldset class="newtag"><label class="category">%s:</label><select name="tag" size="12" multiple>' "${cat}"
     catt="${cat}:"
     [ "$catt" = "none:" ] && catt=''
     
@@ -88,18 +88,18 @@ cat <<EOF
              "$(egrep -q "(^|.*\|)$line(\|.*|$)" "$meta" && printf selected)" \
              "$line" "${line#*:}"
     done
-    printf '</select></p>'
+    printf '</select></fieldset>'
   done
   )
 
-  <p class="newtag additional">
+  <fieldset class="newtag additional">
     <label class="additional">Additional Tags (one per line):</label>
     <textarea name="tags" rows="4"></textarea>
-  </p>
-  <p class="newtag description">
+  </fieldset>
+  <fieldset class="newtag description">
     <label class="description">Description:</label>
     <textarea name="description" rows="4">$description</textarea>
-  </p>
+  </fieldset>
   <input type="submit" value="Edit!">
   <input type="submit" name="trash" value="Delete Video">
 

diff --git a/templates/tagger.html.sh b/templates/tagger.html.sh
index 48383995b0cdb02fc3c4118e8cc58dc235d1535e..4b1d0fe698f83e47b74366d6f328ebca38f94095 100755 (executable)
--- a/templates/tagger.html.sh
+++ b/templates/tagger.html.sh
@@ -26,13 +26,13 @@ category_options(){
 category_box(){
   for cat in "$@"; do
   cat <<EOF
-  <p class="newtag">
+  <fieldset class="newtag">
     <label class="category">${cat}:</label>
     <input type="hidden" name="category" value="$cat">
     <select name="ctag" size="12" multiple>
       $(category_options "$cat")
     </select>
-  </p>
+  </fieldset>
 EOF
   done
 }
@@ -41,10 +41,10 @@ cat <<EOF
   <div class="panel switchable bottom" id="tagger">
     <p class="help">Add selectetd tags to selected videos.</p>
     $(category_box $(list_categories))
-    <p class="newtag additional">
+    <fieldset class="newtag additional">
       <label class="additional">Additional Tags (one per line):</label>
       <textarea name="tags" rows="2"></textarea>
-    </p>
+    </fieldset>
     <input type="submit" value="Add Tags!">
 
     <a class="panel toggle" href="#foot">Hide</a>