diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-03 09:09:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 09:09:45 +0200 |
commit | ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f (patch) | |
tree | bee406df7af4b6e024764e153d8844dfe69aeda1 /app/Resources/static/themes/baggy/css/main.css | |
parent | dfbbf0e18ad585e318c2609e46963e4b9fd198ef (diff) | |
parent | 49f25d6ee820619a15851b12a33667d707e4edf7 (diff) | |
download | wallabag-ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f.tar.gz wallabag-ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f.tar.zst wallabag-ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f.zip |
Merge pull request #2314 from wallabag/assets
Assets work
Diffstat (limited to 'app/Resources/static/themes/baggy/css/main.css')
-rwxr-xr-x | app/Resources/static/themes/baggy/css/main.css | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 7ffaa12c..eeedd277 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -481,9 +481,6 @@ footer a { | |||
481 | text-transform: none; | 481 | text-transform: none; |
482 | margin-bottom: 0; | 482 | margin-bottom: 0; |
483 | line-height: 1.2; | 483 | line-height: 1.2; |
484 | text-align: justify; | ||
485 | -moz-text-align-last: center; | ||
486 | text-align-last: center; | ||
487 | } | 484 | } |
488 | 485 | ||
489 | .entry h2::after { | 486 | .entry h2::after { |
@@ -735,12 +732,7 @@ a.add-to-wallabag-link-after::after { | |||
735 | 732 | ||
736 | @font-face { | 733 | @font-face { |
737 | font-family: icomoon; | 734 | font-family: icomoon; |
738 | src: url("../fonts/icomoon.eot?-s0mcsx"); | 735 | src: url("../fonts/IcoMoon-Free.ttf"); |
739 | src: | ||
740 | url("../fonts/icomoon.eot?#iefix-s0mcsx") format("embedded-opentype"), | ||
741 | url("../fonts/icomoon.woff?-s0mcsx") format("woff"), | ||
742 | url("../fonts/icomoon.ttf?-s0mcsx") format("truetype"), | ||
743 | url("../fonts/icomoon.svg?-s0mcsx#icomoon") format("svg"); | ||
744 | font-weight: normal; | 736 | font-weight: normal; |
745 | font-style: normal; | 737 | font-style: normal; |
746 | } | 738 | } |
@@ -1071,7 +1063,7 @@ pre code { | |||
1071 | font-family: "Courier New", Courier, monospace; | 1063 | font-family: "Courier New", Courier, monospace; |
1072 | } | 1064 | } |
1073 | 1065 | ||
1074 | #filter-form { | 1066 | #filters { |
1075 | position: fixed; | 1067 | position: fixed; |
1076 | width: 20%; | 1068 | width: 20%; |
1077 | height: 100%; | 1069 | height: 100%; |
@@ -1086,7 +1078,7 @@ pre code { | |||
1086 | min-width: 300px; | 1078 | min-width: 300px; |
1087 | } | 1079 | } |
1088 | 1080 | ||
1089 | #filter-form form .filter-group { | 1081 | #filters form .filter-group { |
1090 | margin: 5px; | 1082 | margin: 5px; |
1091 | } | 1083 | } |
1092 | 1084 | ||
@@ -1125,9 +1117,11 @@ pre code { | |||
1125 | .entry { | 1117 | .entry { |
1126 | width: 49%; | 1118 | width: 49%; |
1127 | } | 1119 | } |
1120 | |||
1128 | .entry:nth-child(3n+1) { | 1121 | .entry:nth-child(3n+1) { |
1129 | margin-left: 1.5%; | 1122 | margin-left: 1.5%; |
1130 | } | 1123 | } |
1124 | |||
1131 | .entry:nth-child(2n+1) { | 1125 | .entry:nth-child(2n+1) { |
1132 | margin-left: 0; | 1126 | margin-left: 0; |
1133 | } | 1127 | } |
@@ -1137,6 +1131,7 @@ pre code { | |||
1137 | #article { | 1131 | #article { |
1138 | width: 80%; | 1132 | width: 80%; |
1139 | } | 1133 | } |
1134 | |||
1140 | .topPosF { | 1135 | .topPosF { |
1141 | right: 2.5em; | 1136 | right: 2.5em; |
1142 | } | 1137 | } |
@@ -1147,6 +1142,7 @@ pre code { | |||
1147 | width: 100%; | 1142 | width: 100%; |
1148 | margin-left: 0; | 1143 | margin-left: 0; |
1149 | } | 1144 | } |
1145 | |||
1150 | #display-mode { | 1146 | #display-mode { |
1151 | display: none; | 1147 | display: none; |
1152 | } | 1148 | } |
@@ -1197,7 +1193,6 @@ pre code { | |||
1197 | height: auto; | 1193 | height: auto; |
1198 | top: 0.5em; | 1194 | top: 0.5em; |
1199 | width: 75px; | 1195 | width: 75px; |
1200 | height: 75px; | ||
1201 | margin-left: -37.5px; | 1196 | margin-left: -37.5px; |
1202 | } | 1197 | } |
1203 | 1198 | ||
@@ -1214,6 +1209,7 @@ pre code { | |||
1214 | background-color: #999; | 1209 | background-color: #999; |
1215 | font-size: 1.2em; | 1210 | font-size: 1.2em; |
1216 | } | 1211 | } |
1212 | |||
1217 | .desktopHide:hover, | 1213 | .desktopHide:hover, |
1218 | .desktopHide:focus { | 1214 | .desktopHide:focus { |
1219 | background-color: #fff; | 1215 | background-color: #fff; |