From 3b1e2f34fe9e96853a084c279a0afd65d2e21447 Mon Sep 17 00:00:00 2001
From: Kyle Doherty <kyle.l.doherty@gmail.com>
Date: Thu, 10 Sep 2015 17:54:45 -0700
Subject: [PATCH] new nav tweaks
---
resources/frontend_client/app/css/core/hide.css | 10 +++++-----
resources/frontend_client/app/css/core/layout.css | 2 --
resources/frontend_client/app/css/home.css | 9 ++++++---
.../app/home/components/ActivityItem.react.js | 2 +-
.../app/home/components/ActivityStory.react.js | 1 -
resources/frontend_client/index_template.html | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/resources/frontend_client/app/css/core/hide.css b/resources/frontend_client/app/css/core/hide.css
index 7c3d0b254b8..faafa64de1f 100644
--- a/resources/frontend_client/app/css/core/hide.css
+++ b/resources/frontend_client/app/css/core/hide.css
@@ -1,5 +1,5 @@
.hide { display: none !important; }
-.show { display: block; }
+.show { display: inheirt; }
.sm-show,
.md-show,
@@ -12,7 +12,7 @@
.sm-hide { display: none !important; }
}
@media screen and (--breakpoint-min-sm) {
- .sm-show { display: block !important; }
+ .sm-show { display: inherit !important; }
}
/* medium */
@@ -21,7 +21,7 @@
.md-hide { display: none !important; }
}
@media screen and (--breakpoint-min-md) {
- .md-show { display: block !important; }
+ .md-show { display: inherit !important; }
}
/* large */
@@ -29,7 +29,7 @@
.lg-hide { display: none !important; }
}
@media screen and (--breakpoint-min-lg) {
- .lg-show { display: block !important; }
+ .lg-show { display: inherit !important; }
}
/* xl */
@@ -37,5 +37,5 @@
.xl-hide { display: none !important; }
}
@media screen and (--breakpoint-min-xl) {
- .xl-show { display: block !important; }
+ .xl-show { display: inherit !important; }
}
diff --git a/resources/frontend_client/app/css/core/layout.css b/resources/frontend_client/app/css/core/layout.css
index 85f1db10983..3f2f6ba693b 100644
--- a/resources/frontend_client/app/css/core/layout.css
+++ b/resources/frontend_client/app/css/core/layout.css
@@ -7,8 +7,6 @@
.wrapper {
width: 100%;
margin: 0 auto;
- padding-left: 1.5em;
- padding-right: 1.5em;
}
@media screen and (--breakpoint-min-sm) {
diff --git a/resources/frontend_client/app/css/home.css b/resources/frontend_client/app/css/home.css
index f3148389f9d..7db4b55b02f 100644
--- a/resources/frontend_client/app/css/home.css
+++ b/resources/frontend_client/app/css/home.css
@@ -198,9 +198,6 @@
line-height: 1.4;
}
-.HomeLayout {
-}
-
@media screen and (--breakpoint-min-md) {
.HomeLayout {
margin-right: 346px;
@@ -220,3 +217,9 @@
margin-right: auto;
}
}
+
+@media screen and (--breakpoint-min-lg) {
+ .HomeLayout {
+ font-size: 1.08rem;
+ }
+}
diff --git a/resources/frontend_client/app/home/components/ActivityItem.react.js b/resources/frontend_client/app/home/components/ActivityItem.react.js
index 75a01259f3d..e72ce0abbc7 100644
--- a/resources/frontend_client/app/home/components/ActivityItem.react.js
+++ b/resources/frontend_client/app/home/components/ActivityItem.react.js
@@ -21,7 +21,7 @@ export default class ActivityItem extends Component {
}
</span>
- <div className="ml2 full flex align-center" style={{fontSize: '1rem'}}>
+ <div className="ml2 full flex align-center">
<div className="text-grey-4">
<span className="text-dark">{description.userName}</span>
diff --git a/resources/frontend_client/app/home/components/ActivityStory.react.js b/resources/frontend_client/app/home/components/ActivityStory.react.js
index d3c2d684249..dba204bba89 100644
--- a/resources/frontend_client/app/home/components/ActivityStory.react.js
+++ b/resources/frontend_client/app/home/components/ActivityStory.react.js
@@ -9,7 +9,6 @@ export default class ActivityStory extends Component {
this.styles = {
borderWidth: '2px',
- fontSize: '1.08rem',
borderColor: '#DFE8EA',
}
}
diff --git a/resources/frontend_client/index_template.html b/resources/frontend_client/index_template.html
index 20307cdf266..42983834916 100644
--- a/resources/frontend_client/index_template.html
+++ b/resources/frontend_client/index_template.html
@@ -15,7 +15,7 @@
<body ng-controller="Metabase">
<div class="Nav" ng-controller="Nav" ng-if="user" ng-cloak>
<!-- MAIN NAV -->
- <nav class="py2 sm-py1 xl-py3 relative bg-brand" ng-show="nav === 'main'">
+ <nav class="sm-py2 sm-py1 xl-py3 relative bg-brand" ng-show="nav === 'main'">
<ul class="wrapper flex align-center">
<li>
<a class="NavItem cursor-pointer text-white flex align-center my1" href="/">
@@ -59,7 +59,7 @@
</div>
</li>
<li class="flex-align-right">
- <a class="rounded inline-block bg-white text-brand cursor-pointer p2 no-decoration" href="/q">New Question</a>
+ <a class="rounded inline-block bg-white text-brand cursor-pointer p2 no-decoration" href="/q">New <span class="hide sm-show">Question</span></a>
<div mb-profile-link class="inline-block text-white" user="user" context="nav"></div>
</li>
</ul>
--
GitLab