Merge branch 'version-1.2'

juherpin · Sep 1, 2013 · c834893 · c834893
1 parent 50087a1
commit c834893
Show file tree

Hide file tree

Showing 11 changed files with 346 additions and 879 deletions.
diff --git a/blank_theme.css b/blank_theme.css
@@ -6,35 +6,11 @@
  * Give yourself some credit here
  *
  */
-
-/* Container */
-.dk_mytheme .dk_container {}
-  .dk_mytheme a {}
-
-/* Toggle */
-.dk_mytheme .dk_toggle {}
-  .dk_mytheme .dk_toggle:hover {}
-
-/* Focus State */
-.dk_mytheme.dk_focus,
-.dk_mytheme:focus {}
-  .dk_mytheme.dk_focus .dk_toggle {}
-
-/* Open State */
-.dk_mytheme.dk_open {}
-  .dk_mytheme.dk_open .dk_toggle {}
-
-/* Options Menu */
-.dk_mytheme .dk_options {}
-  .dk_mytheme .dk_options a {}
-  .dk_mytheme .dk_options a:hover,
-  .dk_mytheme .dk_option_current a {}
-  .dk_mytheme .dk_options .disabled {}
-  .dk_mytheme .dk_options .disabled:hover {}
-
-/* Inner options */
-.dk_mytheme .dk_options_inner {}
-
-/* Set a width property here */
-.dk_mytheme .dk_options_inner,
-.dk_mytheme.dk_touch .dk_options {}
+.dk_mytheme {
+  /* Container */
+  /* Toggle */
+  /* Focus State */
+  /* Open State */
+  /* Options Menu */
+  /* Inner Options */
+  /* Set a width property here */ }
diff --git a/dropkick.css b/dropkick.css
@@ -7,51 +7,22 @@
  * See the readme for themeing help
  *
  */
-
-.dk_options .disabled a {
-  color: #aaa;
-}
-.dk_options .disabled:hover a {
-  cursor: default;
-  background-color: #fff;
-  border-bottom-color: #999;
-  text-shadow: none;
-}
-
-/***** Begin Theme, feel free to edit in here! ******/
-
-/* One container to bind them... */
 .dk_container {
-  background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f5f5f5));
-  background: -moz-linear-gradient(top, #fff, #f5f5f5);
-  background: -o-linear-gradient(top, #fff, #f5f5f5);
   background-color: #f5f5f5;
   font-family: 'Helvetica', Arial, sans-serif;
   font-size: 12px;
   font-weight: bold;
-  line-height: 14px;
   margin-bottom: 18px;
   border-radius: 5px;
   -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-}
+  -webkit-border-radius: 5px; }
   .dk_container:focus {
-    outline: 0;
-  }
+    outline: 0; }
   .dk_container a {
     cursor: pointer;
-    text-decoration: none;
-  }
+    text-decoration: none; }
 
-/* Opens the dropdown and holds the menu label */
 .dk_toggle {
-  /**
-   * Help: Arrow image not appearing
-   * Try updating this property to your correct dk_arrows.png path
-   */
-  background-image: url('images/dk_arrows.png');
-  background-repeat: no-repeat;
-  background-position: right center;
   border: 1px solid #ccc;
   color: #333;
   padding: 7px 45px 7px 10px;
@@ -63,19 +34,24 @@
   -moz-transition: border-color .5s;
   -o-transition: border-color .5s;
   transition: border-color .5s;
-}
+  position: relative; }
   .dk_toggle:hover {
-    border-color: #8c8c8c;
-  }
-  /* Applied when the dropdown is focused */
-  .dk_focus .dk_toggle {
-    border-color: #40b5e2;
-  }
-  .dk_focus .dk_toggle {
-    box-shadow: 0 0 5px #40b5e2;
-    -moz-box-shadow: 0 0 5px #40b5e2;
-    -webkit-box-shadow: 0 0 5px #40b5e2;
-  }
+    border-color: #8c8c8c; }
+  .dk_toggle:after {
+    position: absolute;
+    top: 45%;
+    right: 10px;
+    content: '';
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-top: 5px solid #4B4B4B; }
+
+/* Applied when the dropdown is focused */
+.dk_focus .dk_toggle {
+  border-color: #40b5e2;
+  box-shadow: 0 0 5px #40b5e2;
+  -moz-box-shadow: 0 0 5px #40b5e2;
+  -webkit-box-shadow: 0 0 5px #40b5e2; }
 
 /* Applied whenever the dropdown is open */
 .dk_open {
@@ -86,53 +62,49 @@
    * Help: Dropdown menu is covered by something
    * Try setting this value higher
    */
-  z-index: 10;
-}
+  z-index: 10; }
   .dk_open .dk_toggle {
     background-color: #ececec;
     border-color: #8c8c8c;
     color: #ccc;
     box-shadow: inset 0 -2px 5px #ccc;
     border-radius: 5px 5px 0 0;
     -moz-border-radius: 5px 5px 0 0;
-    -webkit-border-radius: 5px 5px 0 0;
-  }
+    -webkit-border-radius: 5px 5px 0 0; }
 
 /* The outer container of the options */
 .dk_options {
-  box-shadow: rgba(0, 0, 0, .2) 0 2px 8px;
-  -moz-box-shadow: rgba(0, 0, 0, .2) 0 2px 8px;
-  -webkit-box-shadow: rgba(0, 0, 0, .2) 0 2px 8px;
+  background: #fefefe;
+  /* Removes transparent background on iOS5+ scroll */
+  box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px;
+  -moz-box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px;
+  -webkit-box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px;
   border-radius: 0 0 5px 5px;
   -moz-border-radius: 0 0 5px 5px;
-  -webkit-border-radius: 0 0 5px 5px;
-}
+  -webkit-border-radius: 0 0 5px 5px; }
   .dk_options a {
     background-color: #fff;
     border-bottom: 1px solid #999;
     font-weight: bold;
-    padding: 8px 10px;
-  }
-  .dk_options li:last-child a {
-    border-bottom: none;
-  }
+    padding: 8px 10px; }
   .dk_options a:hover,
-  .dk_option_current a {
+  .dk_options .dk_option_current a {
     background-color: #0084c7;
     border-bottom-color: #004c72;
     color: #fff;
     text-decoration: none;
-    text-shadow: rgba(0, 0, 0, .5) 0 1px 0;
-  }
+    text-shadow: rgba(0, 0, 0, 0.5) 0 1px 0; }
+  .dk_options li:last-child a {
+    border-bottom: none; }
   .dk_options .disabled {
-    cursor: default;
-  }
-  .dk_options .disabled:hover {
-    cursor: default;
-    background-color: #fff;
-    border-bottom-color: #999;
-    text-shadow: none;
-  }
+    cursor: default; }
+    .dk_options .disabled a {
+      color: #aaa; }
+    .dk_options .disabled:hover, .dk_options .disabled:hover a {
+      cursor: default;
+      background-color: #fff;
+      border-bottom-color: #999;
+      text-shadow: none; }
 
 /* Inner container for options, this is what makes the scrollbar possible. */
 .dk_options_inner {
@@ -145,67 +117,47 @@
   border-radius: 0 0 5px 5px;
   -moz-border-radius: 0 0 5px 5px;
   -webkit-border-radius: 0 0 5px 5px;
-}
-
-/* Set a max-height on the options inner */
-.dk_options_inner,
-.dk_touch .dk_options {
-  max-height: 250px;
-}
+  max-height: 250px; }
 
 /******  End Theme ******/
-
 /***** Critical to the continued enjoyment of working dropdowns ******/
-
 .dk_container {
   display: none;
-  float: left;
-  position: relative;
-}
+  float: left; }
   .dk_container a {
-    outline: 0;
-  }
+    outline: 0; }
 
 .dk_toggle {
   display: -moz-inline-stack;
   display: inline-block;
   *display: inline;
   position: relative;
-  zoom: 1;
-}
+  zoom: 1; }
 
 .dk_open {
-  position: relative;
-}
+  position: relative; }
   .dk_open .dk_options {
-    display: block;
-  }
+    display: block; }
   .dk_open .dk_label {
-    color: inherit;
-  }
+    color: inherit; }
 
 .dk_options {
   display: none;
   margin-top: -1px;
   position: absolute;
   right: 0;
-  width: 100%;
-}
-  .dk_options a,
-  .dk_options a:link,
-  .dk_options a:visited {
-    display: block;
-  }
-  .dk_options_inner {
-    overflow: auto;
-    -webkit-overflow-scrolling:touch;
-    position: relative;
-  }
+  width: 100%; }
+  .dk_options a, .dk_options a:link, .dk_options a:visited {
+    display: block; }
 
-.dk_fouc select {
-  position: relative;
+.dk_options_inner {
+  overflow: auto;
+  position: relative; }
+
+/* Hides only dropkick <select> instances */
+.dk_container + select {
+  position: absolute;
   top: -99999em;
-  visibility: hidden;
-}
+  visibility: hidden; }
 
 /***** End Critical to the continued enjoyment of working dropdowns ******/