浏览代码

IE fix; material design colors

tags/1.0.0
Robin Thoni 8 年前
父节点
当前提交
2ab27e6519
共有 5 个文件被更改,包括 34 次插入17 次删除
  1. 2
    1
      .gitignore
  2. 11
    0
      app/app.js
  3. 6
    6
      app/index.html
  4. 13
    8
      app/less/app.less
  5. 2
    2
      app/views/home.html

+ 2
- 1
.gitignore 查看文件

@@ -4,4 +4,5 @@ docs
4 4
 .tmp
5 5
 .idea/
6 6
 .DS_Store
7
-/build
7
+/build
8
+web.config

+ 11
- 0
app/app.js 查看文件

@@ -36,6 +36,17 @@ app.config(['$stateProvider', '$urlRouterProvider',
36 36
 
37 37
         $urlRouterProvider.otherwise('/groups');
38 38
 
39
+        if (!('find' in Array.prototype)) {
40
+            Array.prototype.find= function(func) {
41
+                for (var i = 0; i < this.length; ++i) {
42
+                    if (func(this[i])) {
43
+                        return this[i];
44
+                    }
45
+                }
46
+                return null;
47
+            };
48
+        }
49
+
39 50
     }])
40 51
     .directive('dateNow', ['$filter', function($filter) {
41 52
         return {

+ 6
- 6
app/index.html 查看文件

@@ -77,16 +77,16 @@
77 77
 <body>
78 78
 
79 79
 <section layout="row" flex>
80
-    <ng-include src="'views/sidebar.html'"></ng-include>
81
-    <div layout="column" class="layout-column flex">
82
-        <ng-include src="'views/toolbar.html'"></ng-include>
80
+        <ng-include src="'views/sidebar.html'"></ng-include>
81
+        <!--<ng-include src="'views/toolbar.html'"></ng-include>-->
83 82
 
84
-        <md-content flex layout-padding class="md-main-content" >
83
+        <md-content flex class="md-main-content" >
84
+            <ng-include src="'views/toolbar.html'"></ng-include>
85 85
             <div ui-view layout="column" layout-fill layout-align="top center"></div>
86
+            <ng-include src="'views/footer.html'"></ng-include>
86 87
         </md-content>
87 88
 
88
-        <ng-include src="'views/footer.html'"></ng-include>
89
-    </div>
89
+        <!--<ng-include src="'views/footer.html'"></ng-include>-->
90 90
 </section>
91 91
 
92 92
 </body>

+ 13
- 8
app/less/app.less 查看文件

@@ -38,7 +38,8 @@
38 38
 }
39 39
 
40 40
 .md-main-content {
41
-  margin-left: 5px;
41
+  //margin-left: 5px;
42
+  background: none !important;
42 43
 }
43 44
 
44 45
 .welcome-message {
@@ -60,8 +61,10 @@
60 61
 }
61 62
 
62 63
 @calendar-height: 24*30px;
63
-@grey-color: #505050;
64
+@grey-color: #dddddd;
64 65
 @course-font-size: 12px;
66
+@header-text-color: rgba(255, 255, 255, 0.70);
67
+@header-bg-color: #F44336;
65 68
 
66 69
 .day-column {
67 70
   .text-center();
@@ -73,17 +76,18 @@
73 76
 }
74 77
 
75 78
 .day-column-header {
76
-  background-color: darkorange;
77
-  color: #2e6da4;
78
-  font-weight: bold;
79
+  background-color: @header-bg-color;
80
+  color: @header-text-color;
81
+  //font-weight: bold;
79 82
 }
80 83
 
81 84
 .day-column-header-current {
82
-  color: red;
85
+  background-color: #D32F2F;
83 86
 }
84 87
 
85 88
 .day-column-header-today {
86
-  color: green;
89
+  color: white;
90
+  font-weight: bold;
87 91
 }
88 92
 
89 93
 .day-column-header-day {
@@ -97,7 +101,7 @@
97 101
 
98 102
 .day-column-course {
99 103
   position: absolute;
100
-  background-color: cadetblue;
104
+  background-color: #FFCDD2;
101 105
   width: 100%;
102 106
   border-top: solid @grey-color 1px;
103 107
   border-bottom: solid @grey-color 1px;
@@ -160,6 +164,7 @@
160 164
   width: 100%;
161 165
   margin-top: -10px;
162 166
   text-align: right;
167
+  color: rgba(0, 0, 0, 0.54)
163 168
 }
164 169
 
165 170
 .sidebar-group-list {

+ 2
- 2
app/views/home.html 查看文件

@@ -35,7 +35,7 @@
35 35
         </div>
36 36
         <div class="col-xs-11 days-container">
37 37
             <div ng-repeat="day in days" class="col-sm-1 day-column"
38
-                ng-style="{'border-right': $last ? 'solid #505050 1px' : ''}">
38
+                ng-style="{'border-right': $last ? 'solid #dddddd 1px' : ''}">
39 39
                 <div class="day-column-header day-column-header-day"
40 40
                      ng-class="{'day-column-header-current': !isToday(day.date) && selectedDate.getTime() == day.date.getTime(),
41 41
                                 'day-column-header-today': isToday(day.date)}">
@@ -51,7 +51,7 @@
51 51
                          ng-style="{'height': (course.EndPercent - course.BeginPercent) + '%',
52 52
                          'top' : course.BeginPercent + '%', 'width': (100 / course.ParallelCoursesCount)+'%',
53 53
                          'left': (course.ParallelCoursesPosition * (100 / course.ParallelCoursesCount)) + '%',
54
-                         'border-left': (course.ParallelCoursesPosition != 0) ? 'solid #505050 1px' : ''}">
54
+                         'border-left': (course.ParallelCoursesPosition != 0) ? 'solid #dddddd 1px' : ''}">
55 55
                         <span class="day-column-course-name">{{ course.Name }}</span>
56 56
                         <div ng-repeat="room in course.RoomList">
57 57
                             <span class="day-column-room-name">{{room.Name}}</span>

正在加载...
取消
保存