soyjavi 13 лет назад
Родитель
Сommit
2fd2cf8727

+ 1 - 1
examples/kitchen-sink/app/sections/form.html

@@ -5,7 +5,7 @@
         </nav>
     </header>
 
-    <article class="scroll list">
+    <article class="scroll">
             <form>
                 <input type="search" placeholder="type your search" />
                 <a href="#" class="button theme" data-icon="search"></a>

+ 1 - 1
examples/kitchen-sink/app/sections/list.html

@@ -1,4 +1,4 @@
-<section id="list" data-transition="slide">
+    <section id="list" data-transition="slide">
     <header data-title="Lists" class="extended">
         <nav class="button">
             <a href="#back" data-router="section" data-label="back"></a>

+ 19 - 3
examples/kitchen-sink/test.html

@@ -41,11 +41,15 @@
 <body class="app">
     <section id="layout" data-transition="slide">
         <header data-title="Layout">
-            <nav>
+            <nav class="box">
                 <a href="#features" data-router="aside" data-icon="grid"></a>
+                <a href="#features" data-router="aside" data-label="User"></a>
+
             </nav>
-            <nav class="right ">
+            <nav class="right box">
+                <a href="#splash" data-router="section" data-icon="inbox" ></a>
                 <a href="#splash" data-router="section" data-icon="user" data-count="3" ></a>
+
             </nav>
         </header>
 
@@ -61,12 +65,24 @@
         <article id="layout-art1" class="padding scroll">
 
             <form>
+                <input type="search" placeholder="type your search" />
+                <a href="#" class="button theme" data-icon="search"></a>
+
                 <label>Progress</label>
                 <div id="kaka" data-progress="30%"></div>
 
                 <div data-loading="black"></div>
 
                 <div id="cargador"></div>
+
+                <a href="#" class="button big" data-label="Send Email" data-icon="mail"></a>
+
+                <div class="four columns left">
+                        <a href="#" class="button big theme" data-label="Accept" data-icon="check"></a>
+                    </div>
+                    <div class="four columns right">
+                        <a href="#" class="button big red" data-label="Cancel" data-icon="close"></a>
+                    </div>
             </form>
         </article>
         <article id="layout-art2">
@@ -176,7 +192,7 @@
         Lungo.init();
 
         Lungo.ready(function() {
-            Lungo.View.Aside.show('features');
+            // Lungo.View.Aside.show('features');
         });
 
         Lungo.Element.count('#bb', 29);

+ 2 - 1
src/stylesheets/Lungo.layout.nav.less

@@ -28,10 +28,11 @@ nav {
 header nav {
     & a {
         padding: 0 6px;
-        min-width: 28px;
+        min-width: 30px;
         z-index: 1000;
         float: left;
         height: @header-footer-height;
+        text-align: center;
 
         & .icon { font-size: 1.7em; }
 

+ 6 - 4
src/stylesheets/Lungo.theme.default.less

@@ -205,7 +205,9 @@ footer > nav > a, nav.groupbar > a{
 /* @group .button */
 a.button {
     .border-radius(@form-border-radius);
-    .box-shadow(~"inset 1px 0 0 rgba(0,0,0,0.2), inset 0 1px 0 rgba(0,0,0,0.2), inset -1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 2px 0 rgba(255,255,255, 0.2)");
+
+    // .box-shadow(~"inset 1px 0 0 rgba(0,0,0,0.2), inset 0 1px 0 rgba(0,0,0,0.2), inset -1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 2px 0 rgba(255,255,255, 0.2)");
+    .box-shadow(~"inset 0 2px 0 rgba(255,255,255, 0.2)");
 
     font-weight: bold;
     text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
@@ -236,9 +238,9 @@ input:not([type=range]), textarea, select {
     }
 
     &[disabled] {
-        background: #F4F5F0;
-        color: #bbb;
-    }
+        background: #ddd;
+        border-color: #999;
+        color: #999; }
 }
 
 .select:after {

+ 6 - 11
src/stylesheets/Lungo.widgets.button.less

@@ -17,7 +17,7 @@ a.button {
 
     background: #5a5a5a;
 
-    font-size: 14px;
+    font-size: 15px;
     text-align: center;
     text-decoration: none;
     line-height: 40px;
@@ -26,13 +26,11 @@ a.button {
     .user-select(none);
 
     &:active, &.active {
-        background: #4b4b4b;
-    }
+        background: #4b4b4b;}
 
     &:disabled, &.disabled {
         background: rgba(255,255,255,0.2);
-        color: #999 !important;
-    }
+        color: #999 !important; }
 
     & .icon {
         position: relative;
@@ -41,12 +39,10 @@ a.button {
         width: 18px;
         font-size: 18px;
         line-height: 18px;
-        margin-right: 4px;
-    }
+        margin-right: 4px; }
 
     & img {
-        top:  0px !important;
-    }
+        top:  0px !important; }
 
     &.big {
         width: 100%;
@@ -55,7 +51,6 @@ a.button {
 
         & .icon {
             margin: 8px -18px 0 12px;
-            float: left;
-        }
+            float: left; }
     }
 }

+ 3 - 3
src/stylesheets/Lungo.widgets.form.less

@@ -45,7 +45,7 @@ form {
         padding: 0 3%;
         height: @form-input-height;
         font-size: 15px;
-        line-height: 14px;
+        line-height: 16px;
         font-weight: bold;
 
         -webkit-appearance: none;
@@ -60,13 +60,13 @@ form {
 
     /* @group search */
     input[type=search] {
-        width: 85%;
+        width: 86%;
         display: inline-block;
 
         & + .button {
             float: right;
             padding: 0px;
-            width: 13%;
+            width: 11%;
             height: @form-input-height;
             & .icon{
                 top: -3px;

+ 2 - 1
src/stylesheets/css/Lungo.layout.nav.css

@@ -44,10 +44,11 @@ nav abbr {
 }
 header nav a {
   padding: 0 6px;
-  min-width: 28px;
+  min-width: 30px;
   z-index: 1000;
   float: left;
   height: 44px;
+  text-align: center;
 }
 header nav a .icon {
   font-size: 1.7em;

+ 6 - 5
src/stylesheets/css/Lungo.theme.default.css

@@ -228,9 +228,9 @@ a.button {
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
   background-clip: padding-box;
-  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,0.2), inset 0 1px 0 rgba(0,0,0,0.2), inset -1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 2px 0 rgba(255,255,255, 0.2);
-  -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,0.2), inset 0 1px 0 rgba(0,0,0,0.2), inset -1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 2px 0 rgba(255,255,255, 0.2);
-  box-shadow: inset 1px 0 0 rgba(0,0,0,0.2), inset 0 1px 0 rgba(0,0,0,0.2), inset -1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 rgba(0,0,0,0.2), inset 0 2px 0 rgba(255,255,255, 0.2);
+  -webkit-box-shadow: inset 0 2px 0 rgba(255,255,255, 0.2);
+  -moz-box-shadow: inset 0 2px 0 rgba(255,255,255, 0.2);
+  box-shadow: inset 0 2px 0 rgba(255,255,255, 0.2);
   font-weight: bold;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
 }
@@ -270,8 +270,9 @@ select:focus {
 input:not([type=range])[disabled],
 textarea[disabled],
 select[disabled] {
-  background: #F4F5F0;
-  color: #bbb;
+  background: #ddd;
+  border-color: #999;
+  color: #999;
 }
 .select:after {
   background: #d0d4c6;

+ 1 - 1
src/stylesheets/css/Lungo.widgets.button.css

@@ -14,7 +14,7 @@ a.button {
   padding: 0 8px;
   color: #fff !important;
   background: #5a5a5a;
-  font-size: 14px;
+  font-size: 15px;
   text-align: center;
   text-decoration: none;
   line-height: 40px;

+ 3 - 3
src/stylesheets/css/Lungo.widgets.form.css

@@ -63,7 +63,7 @@ form select {
   padding: 0 3%;
   height: 30px;
   font-size: 15px;
-  line-height: 14px;
+  line-height: 16px;
   font-weight: bold;
   -webkit-appearance: none;
   -webkit-user-select: text;
@@ -74,13 +74,13 @@ form textarea {
   min-height: 48px;
 }
 form input[type=search] {
-  width: 85%;
+  width: 86%;
   display: inline-block;
 }
 form input[type=search]  + .button {
   float: right;
   padding: 0px;
-  width: 13%;
+  width: 11%;
   height: 30px;
 }
 form input[type=search]  + .button .icon {