Răsfoiți Sursa

Use up to date bootstrap material design assets

Johannes Zellner 11 ani în urmă
părinte
comite
2c2c10d3d3

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/css/bootstrap-material-design.min.css


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/css/bootstrap-material-design.min.css.map


+ 2 - 0
frontend/3rdparty/css/ripples.min.css

@@ -0,0 +1,2 @@
+.withripple{position:relative}.ripple-container{position:absolute;top:0;left:0;z-index:1;width:100%;height:100%;overflow:hidden;border-radius:inherit;pointer-events:none}.ripple{position:absolute;width:20px;height:20px;margin-left:-10px;margin-top:-10px;border-radius:100%;background-color:#000;background-color:rgba(0,0,0,.05);-webkit-transform:scale(1);-ms-transform:scale(1);-o-transform:scale(1);transform:scale(1);-webkit-transform-origin:50%;-ms-transform-origin:50%;-o-transform-origin:50%;transform-origin:50%;opacity:0;pointer-events:none}.ripple.ripple-on{-webkit-transition:opacity .15s ease-in 0s,-webkit-transform .5s cubic-bezier(.4,0,.2,1) .1s;-o-transition:opacity .15s ease-in 0s,-o-transform .5s cubic-bezier(.4,0,.2,1) .1s;transition:opacity .15s ease-in 0s,transform .5s cubic-bezier(.4,0,.2,1) .1s;opacity:.1}.ripple.ripple-out{-webkit-transition:opacity .1s linear 0s!important;-o-transition:opacity .1s linear 0s!important;transition:opacity .1s linear 0s!important;opacity:0}
+/*# sourceMappingURL=ripples.min.css.map */

+ 1 - 0
frontend/3rdparty/css/ripples.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["less/ripples.less"],"names":[],"mappings":"AAAA,YACI,SAAA,SAEJ,kBACI,SAAA,SACA,IAAA,EACA,KAAA,EACA,QAAA,EACA,MAAA,KACA,OAAA,KACA,SAAA,OACA,cAAA,QACA,eAAA,KAEJ,QACI,SAAA,SACA,MAAA,KACA,OAAA,KACA,YAAA,MACA,WAAA,MACA,cAAA,KACA,iBAAA,KACA,iBAAA,gBACA,kBAAA,SAAA,cAAA,SAAA,aAAA,SAAA,UAAA,SACA,yBAAA,IAAA,qBAAA,IAAA,oBAAA,IAAA,iBAAA,IACA,QAAA,EACA,eAAA,KAEJ,kBACI,mBAAA,QAAA,KAAA,QAAA,GAAA,kBAAA,IAAA,wBAAA,IAAA,cAAA,QAAA,KAAA,QAAA,GAAA,aAAA,IAAA,wBAAA,IAAA,WAAA,QAAA,KAAA,QAAA,GAAA,UAAA,IAAA,wBAAA,IACA,QAAA,GAEJ,mBACI,mBAAA,QAAA,IAAA,OAAA,aAAA,cAAA,QAAA,IAAA,OAAA,aAAA,WAAA,QAAA,IAAA,OAAA,aACA,QAAA"}

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/js/material.min.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/js/material.min.js.map


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/js/ripples.min.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
frontend/3rdparty/js/ripples.min.js.map


+ 14 - 3
frontend/index.html

@@ -10,7 +10,7 @@
 
     <link rel="stylesheet" href="3rdparty/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="3rdparty/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="3rdparty/css/material.min.css"/>
+    <link rel="stylesheet" href="3rdparty/css/bootstrap-material-design.min.css"/>
     <link rel="stylesheet" href="3rdparty/css/ripples.min.css"/>
     <link rel="stylesheet" href="3rdparty/css/roboto.min.css"/>
 
@@ -131,10 +131,21 @@
       </div>
       <div class="row">
         <div class="col-md-6 col-md-offset-3">
-          <div class="form-group has-success">
+          <div class="form-group label-floating">
             <label class="control-label" for="inputSearch">Search</label>
-            <input class="form-control" id="inputSearch" type="text" v-model="search" v-on:keyup.enter="doSearch"/>
+            <div class="input-group">
+              <input id="inputSearch" class="form-control" type="text" v-model="search" v-on:keyup.enter="doSearch">
+              <span class="input-group-btn">
+                <button type="button" class="btn btn-xs">
+                  <i class="fa fa-close"></i>
+                </button>
+              </span>
+            </div>
           </div>
+          <!-- <div class="form-group has-success">
+            <label class="control-label" for="inputSearch">Search</label>
+            <input class="form-control" id="inputSearch" type="text" v-model="search" v-on:keyup.enter="doSearch"/>
+          </div> -->
         </div>
       </div>
       <div class="row">

+ 2 - 0
frontend/js/main.js

@@ -76,6 +76,8 @@ Core.things.onEdited(refresh);
 Core.things.onDeleted(refresh);
 
 // Main
+$.material.init();
+
 Core.settings.get(function (error) {
     if (error) return console.error(error);
 

+ 2 - 2
gulpfile.js

@@ -49,8 +49,8 @@ gulp.task('3rdparty', function () {
         'node_modules/jquery/dist/*.min.js*',
         'node_modules/bootstrap/dist/**/*.min.css*',
         'node_modules/bootstrap/dist/**/*.min.js*',
-        'node_modules/bootstrap-material-design/dist/**/*.min.css*',
-        'node_modules/bootstrap-material-design/dist/**/*.min.js*',
+        'frontend/3rdparty/**/*.min.css*',
+        'frontend/3rdparty/**/*.min.js*',
         'node_modules/font-awesome/**/font-awesome.min.css',
         'node_modules/font-awesome/**/font-awesome.css.map',
         'node_modules/font-awesome/**/*.+(otf|eot|svg|ttf|woff|woff2)'

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff