浏览代码

css fix

tags/v1.0
Robin Thoni 7 年前
父节点
当前提交
89854a7a56

+ 6
- 5
backend/WebSem/.idea/.idea.WebSem/.idea/workspace.xml 查看文件

@@ -79,7 +79,7 @@
79 79
         <entry file="file://$PROJECT_DIR$/WebApiWebSem/NuGet.Config">
80 80
           <provider selected="true" editor-type-id="text-editor">
81 81
             <state relative-caret-position="108">
82
-              <caret line="6" column="16" lean-forward="false" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
82
+              <caret line="6" column="16" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
83 83
               <folding />
84 84
             </state>
85 85
           </provider>
@@ -300,12 +300,12 @@
300 300
       <workItem from="1487345029610" duration="5634000" />
301 301
       <workItem from="1487441650798" duration="14018000" />
302 302
       <workItem from="1487528667649" duration="13931000" />
303
-      <workItem from="1487802391451" duration="9085000" />
303
+      <workItem from="1487802391451" duration="10532000" />
304 304
     </task>
305 305
     <servers />
306 306
   </component>
307 307
   <component name="TimeTrackingManager">
308
-    <option name="totallyTimeSpent" value="49882000" />
308
+    <option name="totallyTimeSpent" value="51329000" />
309 309
   </component>
310 310
   <component name="TodoView">
311 311
     <todo-panel id="selected-file">
@@ -318,6 +318,7 @@
318 318
   </component>
319 319
   <component name="ToolWindowManager">
320 320
     <frame x="0" y="0" width="1920" height="1061" extended-state="0" />
321
+    <editor active="true" />
321 322
     <layout>
322 323
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32908705" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
323 324
       <window_info id="Errors In Solution" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32976446" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -326,7 +327,7 @@
326 327
       <window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
327 328
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
328 329
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2282378" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
329
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19745223" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
330
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19745223" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
330 331
       <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24203822" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
331 332
       <window_info id="Change Signature" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
332 333
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21841542" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -711,7 +712,7 @@
711 712
     <entry file="file://$PROJECT_DIR$/WebApiWebSem/NuGet.Config">
712 713
       <provider selected="true" editor-type-id="text-editor">
713 714
         <state relative-caret-position="108">
714
-          <caret line="6" column="16" lean-forward="false" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
715
+          <caret line="6" column="16" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
715 716
           <folding />
716 717
         </state>
717 718
       </provider>

+ 8
- 0
frontend/WebSem/app/less/app.less 查看文件

@@ -164,6 +164,14 @@ md-table-container tbody tr {
164 164
   .justify-text();
165 165
 }
166 166
 
167
+.grid-picture {
168
+  cursor: pointer;
169
+  img {
170
+    max-width: 100%;
171
+    max-height: 100%;
172
+  }
173
+}
174
+
167 175
 .image-grid {
168 176
   .red {
169 177
     background: #ff8a80;

+ 5
- 5
frontend/WebSem/app/views/articlesCategory.html 查看文件

@@ -25,11 +25,11 @@
25 25
         <span flex="15"></span>
26 26
         <md-grid-list class="image-grid" md-cols="4" md-row-height="200px" md-row-height-gt-sm="300px"
27 27
                       md-row-height-gt-md="450px" md-gutter="4px" flex="60">
28
-            <md-grid-tile ng-repeat="item in items.data" class="red" md-colspan="{{$index < 2 ? 2 : 1}}" md-rowspan="1">
29
-                <a ui-sref="articles_view({id: item.id, item: item})">
30
-                    <img class="article-picture" ng-src="{{item.pictureUrl}}">
31
-                    <md-grid-tile-footer><h3>{{ item.title }}</h3></md-grid-tile-footer>
32
-                </a>
28
+            <md-grid-tile ng-repeat="item in items.data" class="red grid-picture" md-colspan="{{$index < 2 ? 2 : 1}}"
29
+                          ng-class="{red: itemType == 'persons', purple: itemType == 'countries', blue: itemType == 'locations'}"
30
+                          md-rowspan="1" ui-sref="articles_view({id: item.id, item: item})">
31
+                <img class="article-picture" ng-src="{{item.pictureUrl}}">
32
+                <md-grid-tile-footer><h3>{{ item.title }}</h3></md-grid-tile-footer>
33 33
             </md-grid-tile>
34 34
         </md-grid-list>
35 35
     </div>

+ 9
- 15
frontend/WebSem/app/views/home.html 查看文件

@@ -5,23 +5,17 @@
5 5
     <div layout="row">
6 6
         <span flex="25"></span>
7 7
         <md-grid-list class="image-grid" md-cols="2" md-row-height="200px" md-row-height-gt-sm="300px" md-row-height-gt-md="450px" md-gutter="4px" flex="40">
8
-            <md-grid-tile class="red" md-colspan="2" md-rowspan="1">
9
-                <a ui-sref="persons">
10
-                    <img class="article-picture" src="http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300">
11
-                    <md-grid-tile-footer><h3>{{ 'persons.name' | translate }}</h3></md-grid-tile-footer>
12
-                </a>
8
+            <md-grid-tile class="red grid-picture" md-colspan="2" md-rowspan="1" ui-sref="persons">
9
+                <img src="http://commons.wikimedia.org/wiki/Special:FilePath/Sir_Winston_S_Churchill.jpg?width=300">
10
+                <md-grid-tile-footer><h3>{{ 'persons.name' | translate }}</h3></md-grid-tile-footer>
13 11
             </md-grid-tile>
14
-            <md-grid-tile class="purple" md-colspan="1" md-rowspan="1">
15
-                <a ui-sref="countries">
16
-                    <img class="article-picture" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Flag_of_Canada_%28Pantone%29.svg/1000px-Flag_of_Canada_%28Pantone%29.svg.png">
17
-                    <md-grid-tile-footer><h3>{{ 'countries.name' | translate }}</h3></md-grid-tile-footer>
18
-                </a>
12
+            <md-grid-tile class="purple grid-picture" md-colspan="1" md-rowspan="1" ui-sref="countries">
13
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Flag_of_France.svg/256px-Flag_of_France.svg.png">
14
+                <md-grid-tile-footer><h3>{{ 'countries.name' | translate }}</h3></md-grid-tile-footer>
19 15
             </md-grid-tile>
20
-            <md-grid-tile class="blue" md-colspan="1" md-rowspan="1">
21
-                <a ui-sref="locations">
22
-                    <img class="article-picture" src="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/Europe_orthographic_Caucasus_Urals_boundary_%28with_borders%29.svg/langfr-280px-Europe_orthographic_Caucasus_Urals_boundary_%28with_borders%29.svg.png">
23
-                    <md-grid-tile-footer><h3>{{ 'locations.name' | translate }}</h3></md-grid-tile-footer>
24
-                </a>
16
+            <md-grid-tile class="blue grid-picture" md-colspan="1" md-rowspan="1" ui-sref="locations">
17
+                <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/4/44/Europe_orthographic_Caucasus_Urals_boundary_%28with_borders%29.svg/langfr-280px-Europe_orthographic_Caucasus_Urals_boundary_%28with_borders%29.svg.png">
18
+                <md-grid-tile-footer><h3>{{ 'locations.name' | translate }}</h3></md-grid-tile-footer>
25 19
             </md-grid-tile>
26 20
         </md-grid-list>
27 21
     </div>

正在加载...
取消
保存