Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Tim's UI tweaks for 1.0 global UI updates #861

Merged
merged 9 commits into from
Dec 6, 2017
Merged

WIP - Tim's UI tweaks for 1.0 global UI updates #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3711990
some dropshadow and other CSS tweaks
Dec 4, 2017
62b382b
Merge branch 'global-ui' of https://github.com/netlify/netlify-cms in…
Dec 5, 2017
83ca8f5
Merge branch 'global-ui' of https://github.com/netlify/netlify-cms in…
Dec 5, 2017
6584917
fix deploy
erquhart Dec 5, 2017
9139dee
Merge branch 'global-ui' of https://github.com/netlify/netlify-cms in…
Dec 5, 2017
7b7b354
Manual merge of origin/global-ui into /neutyp/global-ui
Dec 5, 2017
2154be2
Merge branch 'global-ui' of https://github.com/netlify/netlify-cms in…
Dec 6, 2017
ab65430
more CSS tweaks
Dec 6, 2017
165ef72
remove comments per Shawn's guidance
Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/App/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.nc-appHeader-main {
@apply(--dropShadow);
@apply(--dropShadowMain);
position: fixed;
width: 100%;
top: 0;
Expand Down Expand Up @@ -53,6 +53,7 @@

.nc-appHeader-siteLink {
font-size: 14px;
font-weight: 400;
color: #7b8290;
padding: 10px 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Collection/CollectionTop.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

.nc-collectionPage-topNewButton {
@apply(--button);
@apply(--buttonShadow);
}

.nc-collectionPage-top-viewControls {
Expand Down
4 changes: 4 additions & 0 deletions src/components/Editor/EditorControlPane/EditorControl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.nc-controlPane-control {
margin-top: 16px;

&:first-child {
margin-top: 36px;
}
}
9 changes: 7 additions & 2 deletions src/components/Editor/EditorToolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.nc-entryEditor-toolbar {
@apply(--dropShadow);
box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),
0 1px 3px 0 rgba(68, 74, 87, 0.10),
0 2px 54px rgba(0, 0, 0, 0.1);
position: fixed;
top: 0;
left: 0;
Expand All @@ -17,13 +19,14 @@
height: 100%;
display: flex;
align-items: center;
padding: 0 16px;

}

.nc-entryEditor-toolbar-mainSection {
flex: 10;
display: flex;
justify-content: space-between;
padding: 0 20px;
}

.nc-entryEditor-toolbar-backSection,
Expand All @@ -34,10 +37,12 @@
.nc-entryEditor-toolbar-backSection {
border-right-width: 1px;
font-weight: normal;
padding: 0 20px;
}

.nc-entryEditor-toolbar-metaSection {
border-left-width: 1px;
padding: 0 7px;
}

.nc-entryEditor-toolbar-backArrow {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Editor/EditorToolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ const EditorToolbar = (
<div className="nc-entryEditor-toolbar-backArrow">←</div>
<div>
<div className="nc-entryEditor-toolbar-backCollection">
Writing in {collection.get('label')} collection
Writing in <strong>{collection.get('label')}</strong> collection
</div>
{
hasChanged
? <div className="nc-entryEditor-toolbar-backStatus-hasChanged">Unsaved Changes</div>
: <div className="nc-entryEditor-toolbar-backStatus">Changes saved &#10003;</div>
: <div className="nc-entryEditor-toolbar-backStatus">Changes saved &#10004;</div>
}
</div>
</Link>
Expand Down
25 changes: 21 additions & 4 deletions src/components/UI/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,19 @@
box-shadow: 0 2px 4px 0 rgba(19, 39, 48, .12);
}

--dropShadowMain: {
box-shadow: 0 2px 6px 0 rgba(68, 74, 87, 0.05),
0 1px 3px 0 rgba(68, 74, 87, 0.10);
}

--dropShadowMiddle: {
box-shadow: 0 2px 6px 0 rgba(68,74,87,0.15), 0 1px 3px 0 rgba(68,74,87,0.30);
box-shadow: 0 2px 6px 0 rgba(68,74,87,0.15),
0 1px 3px 0 rgba(68,74,87,0.30);
}

--dropShadowDeep: {
box-shadow: 0 4px 12px 0 rgba(68,74,87,0.15), 0 1px 3px 0 rgba(68,74,87,0.25);
box-shadow: 0 4px 12px 0 rgba(68,74,87,0.15),
0 1px 3px 0 rgba(68,74,87,0.25);
}

--caretDown: {
Expand All @@ -104,8 +111,8 @@
}

--card: {
@apply(--dropShadow);
border-radius: 8px;
@apply(--dropShadowMain);
border-radius: 5px;
background-color: #fff;
}

Expand All @@ -118,6 +125,16 @@
cursor: pointer;
}

--buttonShadow {
@apply(--button);
@apply(--dropShadowDeep);

&:hover {
color: white;
background-color: #555b65;
}
}

--textBadge: {
color: #3a69c7;
font-size: 13px;
Expand Down