浏览代码

renamed examples folder in docs, merged inconsistencies between different less,

Emanuele Marchi 11 年之前
父节点
当前提交
a93bd5f912

文件差异内容过多而无法显示
+ 0 - 0
build/css/bootstrap3/bootstrap-switch.css


+ 0 - 0
examples/index.css → docs/index.css


+ 0 - 0
examples/index.html → docs/index.html


+ 0 - 0
examples/index.js → docs/index.js


+ 0 - 0
examples/index.min.js → docs/index.min.js


+ 26 - 21
src/less/bootstrap2/bootstrap-switch.less

@@ -2,7 +2,7 @@
  * bootstrap-switch v1.9.0 by Larentis Mattia @SpiritualGuru
  * http://www.larentis.eu/
  *
- * and Peter Stein (BdMdesigN)
+ * Enhanced for radiobuttons by Stein, Peter @BdMdesigN
  * http://www.bdmdesign.org/
  *
  * Project site:
@@ -27,21 +27,22 @@
   line-height: 8px;
   .user-select(none);
   vertical-align: middle;
-
   min-width: 100px;
 
   &.switch-mini {
     min-width: 72px;
+
+    i.switch-mini-icons {
+      height: 1.20em;
+      line-height: 9px;
+      vertical-align: text-top;
+      text-align: center;
+      transform: scale(0.6);
+      margin-top: -1px;
+      margin-bottom: -1px;
+    }
   }
-  &.switch-mini i.switch-mini-icons {
-    height: 1.20em;
-    line-height: 9px;
-    vertical-align: text-top;
-    text-align: center;
-    transform: scale(0.6);
-    margin-top: -1px;
-    margin-bottom: -1px;
-  }
+
   &.switch-small {
     min-width: 80px;
   }
@@ -53,10 +54,13 @@
   &.deactivate {
     .opacity(50);
     cursor: default !important;
-    label, span {
+
+    label,
+    span {
       cursor: default !important;
     }
   }
+
   > div {
     display: inline-block;
     width: 150%;
@@ -66,30 +70,32 @@
     &.switch-animate {
       .transition(left 0.5s);
     }
+
     &.switch-off {
       left: -50%;
     }
+
     &.switch-on {
       left: 0%;
     }
   }
+
   input[type=radio],
   input[type=checkbox] {
-    //debug
+    // debug
     display: none;
-    //position: absolute;
-    //margin-left: 60%;
-    //z-index: 123;
+    // position: absolute;
+    // margin-left: 60%;
+    // z-index: 123;
   }
 
-  span, label {
+  span,
+  label {
     .box-sizing(border-box);
-
     cursor: pointer;
     position: relative;
     display: inline-block;
     height: 100%;
-
     padding-bottom: 4px;
     padding-top: 4px;
     font-size: 14px;
@@ -125,7 +131,6 @@
     width: 34%;
     border-left: 1px solid @btnBorder;
     border-right: 1px solid @btnBorder;
-
     .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark);
 
     i {
@@ -173,4 +178,4 @@
       .buttonBackground(@btnBackgroundHighlight, @btnBackground, @grayDark, 0 1px 1px rgba(255,255,255,.75));
     }
   }
-}
+}

+ 3 - 11
src/less/bootstrap3/bootstrap-switch.less

@@ -6,7 +6,7 @@
  * http://www.bdmdesign.org/
  *
  * Project site:
- * http://www.larentis.eu/switch/
+ * http://www.bootstrap-switch.org
  * ============================================================
  * Licensed under the Apache License, Version 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -52,7 +52,7 @@
   }
 
   &.deactivate {
-    .opacity(50);
+    .opacity(.5);
     cursor: default !important;
 
     label,
@@ -96,7 +96,6 @@
     position: relative;
     display: inline-block;
     height: 100%;
-
     padding-bottom: 4px;
     padding-top: 4px;
     font-size: 14px;
@@ -156,44 +155,37 @@
     &.switch-right {
       color: #000;
       background: @gray-lighter;
-      // .buttonBackground(@btnBackgroundHighlight, @btnBackground, @grayDark, 0 1px 1px rgba(255,255,255,.75));
     }
 
     &.switch-primary,
     &.switch-left {
       color: #fff;
       background: @btn-primary-bg;
-      // .buttonBackground(@btnPrimaryBackgroundHighlight, @btnPrimaryBackground);
     }
 
     &.switch-info {
       color: #fff;
       background: @btn-info-bg;
-      // .buttonBackground(@btnInfoBackgroundHighlight, @btnInfoBackground);
     }
 
     &.switch-success {
       color: #fff;
       background: @btn-success-bg;
-      // .buttonBackground(@btnSuccessBackgroundHighlight, @btnSuccessBackground);
     }
 
     &.switch-warning {
       background: @btn-warning-bg;
       color: #fff;
-      // .buttonBackground(@btnWarningBackgroundHighlight, @btnWarningBackground);
     }
 
     &.switch-danger {
       color: #fff;
       background: @btn-danger-bg;
-      // .buttonBackground(@btnDangerBackgroundHighlight, @btnDangerBackground);
     }
 
     &.switch-default {
       color: #000;
       background: @gray-lighter;
-      // .buttonBackground(@btnBackgroundHighlight, @btnBackground, @grayDark, 0 1px 1px rgba(255,255,255,.75));
     }
   }
-}
+}

部分文件因为文件数量过多而无法显示