Merge branch 'master' into unified-docs

This commit is contained in:
Kim Gardner
2017-05-26 17:00:53 -04:00
committed by GitHub
7 changed files with 27 additions and 15 deletions
@@ -73,6 +73,8 @@
font-weight: 500;
background-color: transparent;
transition: background-color 200ms;
font-weight: 100;
letter-spacing: .8;
&:hover {
background-color: #232323;
@@ -80,6 +82,7 @@
&.active {
background-color: #232323;
font-weight: 400;
}
}
@@ -3,12 +3,13 @@
background: #989797;
margin: 2px;
vertical-align: middle;
padding: 4px 7px;
padding: 1px 7px;
border-radius: 2px;
margin-left: 10px;
margin-left: 2px;
line-height: 20px;
box-sizing: border-box;
height: 27px;
height: 21px;
right: 0;
margin-top: -2px;
font-size: 12px;
}
@@ -10,7 +10,7 @@ const ModerationHeader = (props) => (
props.asset ?
<div className={`mdl-tabs__tab-bar ${styles.moderateAsset}`}>
<Link className="mdl-tabs__tab" to="/admin/moderate">All Streams</Link>
<a className="mdl-tabs__tab" href={props.asset.url}>
<a className="mdl-tabs__tab" href={props.asset.url} target="_blank">
<span>{props.asset.title}</span>
<Icon className={styles.settingsButton} name="open_in_new"/>
</a>
@@ -18,18 +18,21 @@
.tab {
flex: 1;
color: white;
color: #EEEEEE;
text-transform: capitalize;
font-weight: 500;
font-weight: 100;
font-size: 15px;
letter-spacing: 1px;
transition: border-bottom 200ms;
padding: 0px 5px;
margin-right: 30px;
}
.active {
color: white;
box-sizing: border-box;
border-bottom: solid 5px #F36451;
border-bottom: solid 4px #F36451;
font-weight: 400;
}
.active > span {
@@ -97,7 +100,7 @@ span {
flex: 1;
color: white;
text-transform: capitalize;
font-weight: 500;
font-weight: 400;
font-size: 15px;
letter-spacing: 1px;
transition: opacity 200ms;
@@ -371,6 +374,7 @@ span {
padding: 10px 15px;
box-sizing: border-box;
border-radius: 2px;
bor
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
> div {
@@ -388,6 +392,7 @@ span {
font-size: 13px;
letter-spacing: 0.7px;
font-weight: 400;
border-bottom: 0px;
}
label {
@@ -421,7 +426,8 @@ span {
.tabIcon {
position: relative;
top: 7px;
top: 2px;
font-size: 16px;
}
.username {
+4 -2
View File
@@ -170,6 +170,7 @@ hr {
display: flex;
align-items: center;
justify-content: center;
font-weight: 400;
}
.hidden {
@@ -240,6 +241,8 @@ hr {
.coral-plugin-commentcontent-text {
margin-bottom: 7px;
font-size: 16px;
font-weight: 100;
line-height: 1.3;
}
.coral-plugin-author-name-text {
@@ -319,7 +322,6 @@ button.comment__action-button[disabled],
.coral-plugin-pubdate-text {
display: inline-block;
margin-left: 5px;
}
.coral-plugin-permalinks-container {
@@ -367,7 +369,7 @@ button.comment__action-button[disabled],
.coral-plugin-flags-popup-radio-label {
margin:5px;
font-weight: 700;
font-weight: 400;
font-size: .9rem;
}
+3 -4
View File
@@ -13,10 +13,10 @@
}
.assetURL {
font-size: 16px;
color: black;
text-decoration: none;
font-weight: bold;
font-size: 12px;
color: #2c3e50;
}
.commentBody {
@@ -32,7 +32,7 @@
}
li {
margin-bottom: 10px;
margin-bottom: 5px;
&:nth-child(1) {
color: #5394D7;
@@ -46,7 +46,6 @@
i {
margin-right: 5px;
font-size: 15px;
vertical-align: bottom;
}
a:hover {
+1
View File
@@ -18,6 +18,7 @@
box-sizing: border-box;
border-radius: 2px;
margin: 5px auto;
font-size: 14px;
}
input.error{