From 64f81bc31699ed239e4becec1cfa7ebc0bef2b5a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 31 Mar 2017 20:21:41 +0200 Subject: Adds Webpack support and removes the use for Grunt Signed-off-by: Thomas Citharel use scss Signed-off-by: Thomas Citharel fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes --- .../static/themes/material/css/article.scss | 174 +++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 app/Resources/static/themes/material/css/article.scss (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss new file mode 100644 index 00000000..7d0bdac7 --- /dev/null +++ b/app/Resources/static/themes/material/css/article.scss @@ -0,0 +1,174 @@ +/* ========================================================================== + Article + ========================================================================== */ + +#article { + font-size: 20px; + margin: 0 auto; + max-width: 45em; + + article { + color: #424242; + font-size: 18px; + line-height: 1.7em; + + h1, + h2, + h3, + h4, + h5, + h6 { + color: #212121; + + strong { + font-weight: 500; + } + } + + h6 { + font-size: 1.2rem; + } + + h5 { + font-size: 1.6rem; + } + + h4 { + font-size: 1.9rem; + } + + h3 { + font-size: 2.2rem; + } + + h2 { + font-size: 2.5rem; + } + + h1 { + font-size: 2.7rem; + } + + a { + border-bottom: 1px dotted #03a9f4; + text-decoration: none; + } + + a:hover { + border-bottom-style: solid; + } + + ul { + padding-left: 30px; + } + + ul, + ul li { + list-style-type: disc; + } + + blockquote { + font-style: italic; + } + + strong { + font-weight: bold; + } + } + + img, + figure { + max-width: 100%; + height: auto; + } + + pre { + box-sizing: border-box; + margin: 0 0 1.75em; + border: #e3f2fd 1px solid; + width: 100%; + padding: 10px; + font-family: monospace; + font-size: 0.8em; + white-space: pre; + overflow: auto; + background: #f5f5f5; + border-radius: 3px; + } + + > header > h1 { + font-size: 2em; + margin: 2.1rem 0 0.68rem; + } + + aside { + .tools { + font-size: 0.8em; + display: flex; + flex-flow: row wrap; + margin: 0 auto; + + li { + display: inline-flex; + vertical-align: middle; + } + + a { + color: #000; + text-decoration: none; + } + } + + #list { + float: right; + margin: 0 15px 10px; + } + + .chip { + background-color: $blueAccentColor; + padding: 0 15px 0 10px; + margin: auto 2px; + + a, + i { + color: #fff; + } + } + } +} + +.reader-mode { + width: 95px !important; + transition: width 0.2s ease; + + .collapsible-body { + height: 0; + overflow: hidden; + } + + span { + opacity: 0; + transition: opacity 0.2s ease; + } +} + +.reader-mode:hover { + width: 240px !important; + + .collapsible-body { + height: auto; + } + + span { + opacity: 1; + } +} + +.progress { + position: fixed; + top: 0; + width: 100%; + height: 3px; + margin: 0; + z-index: 9999; +} -- cgit v1.2.3 From 2003ffa97e98d35130c93d158c453ce9b926b838 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 4 May 2017 17:44:42 +0200 Subject: Fix according to review --- .../static/themes/material/css/article.scss | 33 ++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index 7d0bdac7..dc12f857 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -106,11 +106,11 @@ font-size: 0.8em; display: flex; flex-flow: row wrap; - margin: 0 auto; li { display: inline-flex; vertical-align: middle; + margin: 0 5px; } a { @@ -121,7 +121,7 @@ #list { float: right; - margin: 0 15px 10px; + margin: -5px 15px auto; } .chip { @@ -133,12 +133,19 @@ i { color: #fff; } + + i.material-icons { + float: right; + font-size: 20px; + line-height: 32px; + padding-left: 8px; + } } } } .reader-mode { - width: 95px !important; + width: 70px !important; transition: width 0.2s ease; .collapsible-body { @@ -150,17 +157,21 @@ opacity: 0; transition: opacity 0.2s ease; } -} -.reader-mode:hover { - width: 240px !important; + &:hover { + width: 260px !important; - .collapsible-body { - height: auto; - } + .collapsible-body { + height: auto; - span { - opacity: 1; + li a i.material-icons { + margin: auto 5px auto 0; + } + } + + span { + opacity: 1; + } } } -- cgit v1.2.3 From 4c6ee89c9c70f24209f2bb86de2b3137ab2d801c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 May 2017 17:13:08 +0200 Subject: Fix review again Signed-off-by: Thomas Citharel --- .../static/themes/material/css/article.scss | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index dc12f857..0c7735c3 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -103,25 +103,29 @@ aside { .tools { - font-size: 0.8em; display: flex; flex-flow: row wrap; - li { - display: inline-flex; - vertical-align: middle; - margin: 0 5px; - } + .stats { + font-size: 0.8em; + margin: 8px 15px 5px; + + li { + display: inline-flex; + vertical-align: middle; + margin: 0 5px; + } - a { - color: #000; - text-decoration: none; + a { + color: #000; + text-decoration: none; + } } - } - #list { - float: right; - margin: -5px 15px auto; + .tags { + float: right; + margin: 5px 15px 10px; + } } .chip { -- cgit v1.2.3 From efac66cb56d650b863b64c9c4582589da6a2442a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 9 May 2017 11:04:02 +0200 Subject: icon mail a bit better Signed-off-by: Thomas Citharel --- app/Resources/static/themes/material/css/article.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index 0c7735c3..8b67f6bd 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -169,7 +169,7 @@ height: auto; li a i.material-icons { - margin: auto 5px auto 0; + margin: auto 5px auto -8px; } } -- cgit v1.2.3 From 84b041e87f1e2642627bb4f86284ed538333eb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 31 May 2017 20:31:35 +0200 Subject: Reduced border-radius for tags --- app/Resources/static/themes/material/css/article.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index 8b67f6bd..27ff5221 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -132,6 +132,7 @@ background-color: $blueAccentColor; padding: 0 15px 0 10px; margin: auto 2px; + border-radius: 6px; a, i { -- cgit v1.2.3 From 79ea33c9d3139961ff292651f7c3d2ef57b4ea50 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 9 Sep 2017 21:35:19 +0200 Subject: Entry view: update .stats margins and color Decreasing margin of .stats, increasing vertical margin of .stats li, increasing right margin of material icons and reducing contrast of material icons. Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/article.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes/material/css/article.scss') diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index 27ff5221..2d4ef4b4 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -108,12 +108,17 @@ .stats { font-size: 0.8em; - margin: 8px 15px 5px; + margin: 8px 5px 5px; li { display: inline-flex; vertical-align: middle; - margin: 0 5px; + margin: 3px 5px; + + i.material-icons { + color: #3e3e3e; + margin-right: 3px; + } } a { -- cgit v1.2.3