From b970bfd4fec0c8986948f7422c9e095697ceb799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 16 Jun 2015 11:01:45 +0200 Subject: [PATCH 1/6] Removed min-width and improved selector efficiency --- app/modules/home/home.scss | 1 - app/modules/projects/project/project.jade | 2 +- app/styles/core/base.scss | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/modules/home/home.scss b/app/modules/home/home.scss index 769c74ca..e605acea 100644 --- a/app/modules/home/home.scss +++ b/app/modules/home/home.scss @@ -1,6 +1,5 @@ .home-wrapper { display: flex; - padding-top: 2rem; .duty-summary { flex: 1; margin-right: 2rem; diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade index e99fb1ec..9cf43a78 100644 --- a/app/modules/projects/project/project.jade +++ b/app/modules/projects/project/project.jade @@ -1,6 +1,6 @@ div.wrapper tg-project-menu - div.main.centered.single-project + div.centered.single-project section.single-project-intro h1 span.green(class="project-name") {{::vm.project.get("name")}} diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 607251a4..fb8a0bd9 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -45,6 +45,7 @@ body { } .centered { + @extend %main; margin: 0 auto; max-width: 1200px; min-width: 960px; @@ -94,9 +95,10 @@ body { background: $whitish; } +%main, .main { flex: 4; - min-width: 600px; + flex-basis: 600px; padding: 1rem 2rem; } From a677048bd38bc52001e7c95af892ef6726ab0cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 18 Jun 2015 09:52:07 +0200 Subject: [PATCH 2/6] Fix conflicts and IE11 --- app/styles/core/base.scss | 1 - app/styles/modules/home-project.scss | 39 +--------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index fb8a0bd9..3244ad0c 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -46,7 +46,6 @@ body { .centered { @extend %main; - margin: 0 auto; max-width: 1200px; min-width: 960px; width: 90%; diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss index 3300ee9d..233e2170 100644 --- a/app/styles/modules/home-project.scss +++ b/app/styles/modules/home-project.scss @@ -37,7 +37,7 @@ flex: 1; flex-shrink: 3; margin-right: 1rem; - max-width: 800px; + max-width: 960px; width: 0; } .involved-data { @@ -63,40 +63,3 @@ } } } - - -//.summary-stats { -// align-items: flex-start; -// display: flex; -// .info-num { -// @extend %xlarge; -// @extend %bold; -// float: left; -// margin-right: .3rem; -// position: relative; -// top: 5px; -// } -// .info-text { -// @extend %small; -// float: left; -// line-height: .9rem; -// } -//} -// -//.project-data-container { -// display: flex; -// justify-content: space-between; -// ul { -// flex-grow: 0; -// max-width: 33%; -// } -// li { -// display: inline-block; -// margin-right: .1rem; -// width: 10%; -// figure { -// width: 100%; -// } -// } -//} -// From ed7f3599c2877064620160698386cc42bb686ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 18 Jun 2015 10:26:02 +0200 Subject: [PATCH 3/6] Fix centered in IE11 --- app/styles/core/base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 3244ad0c..aa891e32 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -45,7 +45,7 @@ body { } .centered { - @extend %main; + margin: 1rem auto; max-width: 1200px; min-width: 960px; width: 90%; From 7755f8292265fe1435e302989875bd30da2d5944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 16 Jun 2015 11:01:45 +0200 Subject: [PATCH 4/6] Removed min-width and improved selector efficiency --- app/styles/core/base.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index aa891e32..fb8a0bd9 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -45,7 +45,8 @@ body { } .centered { - margin: 1rem auto; + @extend %main; + margin: 0 auto; max-width: 1200px; min-width: 960px; width: 90%; From 06be7d0153bb8a6935e44cc65824590596f08ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 18 Jun 2015 09:52:07 +0200 Subject: [PATCH 5/6] Fix conflicts and IE11 --- app/styles/core/base.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index fb8a0bd9..3244ad0c 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -46,7 +46,6 @@ body { .centered { @extend %main; - margin: 0 auto; max-width: 1200px; min-width: 960px; width: 90%; From a7909ab39272f2b27c6199c60305dd5d439b0a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 18 Jun 2015 10:26:02 +0200 Subject: [PATCH 6/6] Fix centered in IE11 --- app/styles/core/base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 3244ad0c..aa891e32 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -45,7 +45,7 @@ body { } .centered { - @extend %main; + margin: 1rem auto; max-width: 1200px; min-width: 960px; width: 90%;