• R/O
  • HTTP
  • SSH
  • HTTPS

newslash: Commit

newslash


Commit MetaInfo

Revisão9d738a297cde19687eaef8b60941cd7c50eb3074 (tree)
Hora2018-05-31 20:02:18
Autorhylom <hylom@user...>
Commiterhylom

Mensagem de Log

css: rebuild CSS done

Mudança Sumário

Diff

--- a/src/newslash_web/css/newslash.less
+++ b/src/newslash_web/css/newslash.less
@@ -1,8 +1,5 @@
11 /* newslash.less */
22
3-/* reset margin and padding */
4-* { margin: 0; padding: 0; }
5-
63 @import "newslash/base.less";
74 @import "newslash/default.less";
85 @import "newslash/alert.less";
--- a/src/newslash_web/css/newslash/base.less
+++ b/src/newslash_web/css/newslash/base.less
@@ -1,5 +1,6 @@
11 /* base styles for mix-in and extend */
22
3+
34 /* bgcolor: backgound color */
45 @background-color: #fbf9f7;
56 @primary-color: #8b4513;
@@ -25,6 +26,9 @@
2526 @component-horizontal-margin: 8px;
2627 @component-vertical-margin: 8px;
2728
29+@mobile-horizontal-margin: 0;
30+@mobile-vertical-margin: 8px;
31+
2832 /* deprecated
2933
3034 @text-color-weak1: #5e2f0d;
@@ -47,7 +51,6 @@
4751 @comment-property-text-color: #997a49;
4852 */
4953
50-
5154 .glyph {
5255 position: relative;
5356 top: 1px;
@@ -61,15 +64,21 @@
6164 }
6265
6366
67+/**** media query shorthand ****/
68+@mobile: ~"only screen and (max-width: 480px)";
69+
70+
6471 /**** list style ****/
6572 .flatten {
6673 list-style: none;
6774 display: inline-block;
68- margin: 0 0.5em 0 0;
75+ margin-right: 0.5em;
76+ margin-left: 0;
6977 }
7078
7179 .unstyled {
7280 list-style: none;
81+ margin-left: 0;
7382 }
7483
7584 /**** Text size ***/
--- a/src/newslash_web/css/newslash/default.less
+++ b/src/newslash_web/css/newslash/default.less
@@ -1,5 +1,8 @@
11 /* default styles */
22
3+/**** reset margin and padding ****/
4+* { margin: 0; padding: 0; }
5+
36 body {
47 line-height: 180%;
58 background-color: @background-color;
@@ -13,6 +16,10 @@ h1, h2, h3, h4, h5, h6 {
1316 font-size: 100%;
1417 }
1518
19+li {
20+ margin-left: 1.5em;
21+}
22+
1623 p {
1724 margin-bottom: 1em;
1825 }
@@ -28,10 +35,7 @@ a:hover {
2835 }
2936
3037 @media(max-width:480px) {
31- span.abbrevable, div.abbrevable {
32- display: none;
33- }
34- .btn.abbrevable {
35- .btn-text {display: none;}
38+ .abbrevable {
39+ display: none !important;
3640 }
3741 }
\ No newline at end of file
--- a/src/newslash_web/css/newslash/layout.less
+++ b/src/newslash_web/css/newslash/layout.less
@@ -4,70 +4,62 @@
44
55 .main-contents {
66 margin: 0 @component-horizontal-margin;
7+ @media @mobile { margin: 0 @mobile-horizontal-margin; }
78 }
89
910 .sidebar {
1011 width: @sidebar-width;
1112 margin: 0 @component-horizontal-margin;
12-}
13-@media(max-width:480px) {
14- .sidebar {
13+ @media @mobile {
1514 width: 100%;
15+ margin: 0 @mobile-horizontal-margin;
1616 }
1717 }
1818
1919 .timeline-wrapper {
2020 display: flex;
21+ @media @mobile { display: block; }
22+
2123 .main-contents {
2224 flex: 1 1 auto;
2325 order: 0;
26+ @media @mobile { flex: none; }
2427 }
2528 .sidebar {
2629 flex: 0 0 auto;
2730 order: 1;
28- }
29-}
30-@media(max-width:480px) {
31- .timeline-wrapper {
32- display: block;
33- .main-contents {
34- flex: none;
35- }
36- .sidebar {
37- flex: none;
38- }
31+ @media @mobile { flex: none; }
3932 }
4033 }
4134
35+/*
36+ Google's content match ads doesn't display properly in flex,
37+ so now use old-style margin layout
38+*/
4239 .article-wrapper {
4340 margin: 0 @component-horizontal-margin;
41+ @media @mobile { margin: 0 @mobile-horizontal-margin }
4442 .content-wrapper {
4543 float: left;
4644 width: 100%;
4745 margin-right: -(@sidebar-width + @component-horizontal-margin * 2);
46+ @media @mobile {
47+ float: none;
48+ margin-right: inherit;
49+ }
50+
4851 .main-contents {
4952 margin-right: (300px + @component-horizontal-margin * 3) ;
5053 paddding: 0;
54+ @media @mobile { margin-right: inherit; }
5155 }
5256 }
5357 .sidebar {
5458 float: left;
59+ @media @mobile { float: none; }
5560 }
56-}
57-@media(max-width:480px) {
58- .article-wrapper {
59- margin: 0 @component-horizontal-margin;
60- .content-wrapper {
61- float: none;
62- width: 100%;
63- margin-right: inherit;
64- .main-contents {
65- margin-right: inherit;
66- }
67- }
68- .sidebar {
69- float: none;
70- }
61+ .related {
62+ @media @mobile { display: none; }
7163 }
7264 }
7365
--- a/src/newslash_web/templates/common/account_bar.html.tt2
+++ b/src/newslash_web/templates/common/account_bar.html.tt2
@@ -25,7 +25,7 @@
2525 </ul>
2626 </li>
2727 [%- ELSE -%]
28- <li><a href="https://srad.jp/my/newuser">アカウント作成</a></li>
28+ <li class="abbrevable"><a href="https://srad.jp/my/newuser">アカウント作成</a></li>
2929 [%- IF noscript -%]<li><a href="/login?rpath=[% the_path %]">ログイン</a></li>[%- END -%]
3030 <li><a data-toggle="modal" data-target="#login-modal" href="#">ログイン</a></li>
3131 [%- END -%]
--- a/src/newslash_web/templates/search/search.html.tt2
+++ b/src/newslash_web/templates/search/search.html.tt2
@@ -82,16 +82,16 @@
8282 [%- IF prev_page -%]
8383 <span class="prev">
8484 [%- IF start == item_per_page %]
85- <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">≪前</a>
85+ <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">前</a>
8686 [%- ELSE %]
87- <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">≪最初</a>
88- <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start - item_per_page %]">≪前</a>
87+ <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">最初</a>
88+ <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start - item_per_page %]">前</a>
8989 [%- END %]
9090 </span>
9191 [%- END -%]
9292 [%- IF next_page -%]
9393 <span class="next">
94- <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start + item_per_page %]">次≫</a>
94+ <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start + item_per_page %]">次</a>
9595 </span>
9696 [%- END -%]
9797 </div>
Show on old repository browser