Bläddra i källkod

flat ui

develop
Robin Thoni 8 år sedan
förälder
incheckning
e3460f99e1
5 ändrade filer med 8 tillägg och 6 borttagningar
  1. 2
    1
      bower.json
  2. 1
    0
      camotion/index.html
  3. 1
    1
      camotion/views/commands.html
  4. 3
    3
      camotion/views/navbar.html
  5. 1
    1
      camotion/views/sensors.html

+ 2
- 1
bower.json Visa fil

15
     "angular-local-storage": "0.2.3",
15
     "angular-local-storage": "0.2.3",
16
     "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.x",
16
     "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git#0.1.x",
17
     "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x",
17
     "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git#0.1.x",
18
-    "JSONedit": "json-edit#~0.2.1"
18
+    "JSONedit": "json-edit#~0.2.1",
19
+    "flat-ui": "~2.2.2"
19
   },
20
   },
20
   "resolutions": {
21
   "resolutions": {
21
     "angular": "1.4.x"
22
     "angular": "1.4.x"

+ 1
- 0
camotion/index.html Visa fil

9
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
9
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
10
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
10
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
11
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
11
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
12
+    <link href="../bower_components/flat-ui/dist/css/flat-ui.css" rel="stylesheet">
12
     <link rel="stylesheet/less" href="css/app.less">
13
     <link rel="stylesheet/less" href="css/app.less">
13
     <!-- endbuild -->
14
     <!-- endbuild -->
14
 
15
 

+ 1
- 1
camotion/views/commands.html Visa fil

1
 <!-- Page Content -->
1
 <!-- Page Content -->
2
 <div class="container">
2
 <div class="container">
3
-    <lu-basic-table options="luTable" class="row col-sm-8 col-sm-offset-2"></lu-basic-table>
3
+    <lu-basic-table options="luTable" class="row col-sm-10 col-sm-offset-1"></lu-basic-table>
4
 </div>
4
 </div>

+ 3
- 3
camotion/views/navbar.html Visa fil

15
         <!-- Collect the nav links, forms, and other content for toggling -->
15
         <!-- Collect the nav links, forms, and other content for toggling -->
16
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
16
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
17
             <ul class="nav navbar-nav navbar-left">
17
             <ul class="nav navbar-nav navbar-left">
18
-                <li><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET">Cameras</a></li>
19
-                <li><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET">Sensors</a></li>
20
-                <li><a ui-sref="commands" lu-show-permission="CAMOTION_COMMAND_GET">Commands</a></li>
18
+                <li ui-sref-active="active"><a ui-sref="cameras" lu-show-permission="CAMOTION_CAMERA_GET">Cameras</a></li>
19
+                <li ui-sref-active="active"><a ui-sref="sensors" lu-show-permission="CAMOTION_SENSOR_GET">Sensors</a></li>
20
+                <li ui-sref-active="active"><a ui-sref="commands" lu-show-permission="CAMOTION_COMMAND_GET">Commands</a></li>
21
                 <li><a href="/admin" ng-show="canSeeAdmin()">Administration</a></li>
21
                 <li><a href="/admin" ng-show="canSeeAdmin()">Administration</a></li>
22
             </ul>
22
             </ul>
23
             <ul class="nav navbar-nav navbar-right">
23
             <ul class="nav navbar-nav navbar-right">

+ 1
- 1
camotion/views/sensors.html Visa fil

1
 <!-- Page Content -->
1
 <!-- Page Content -->
2
 <div class="container">
2
 <div class="container">
3
-    <lu-basic-table options="luTable" class="row col-sm-8 col-sm-offset-2"></lu-basic-table>
3
+    <lu-basic-table options="luTable" class="row col-sm-10 col-sm-offset-1"></lu-basic-table>
4
 </div>
4
 </div>

Laddar…
Avbryt
Spara