scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updates based on PR Feedback

Browse source 
- Removed Commented SCSS in Main
- Doubled checked Spaces over Tabs
This commit is contained in:
carljbowman 2015-09-21 09:52:53 -04:00
parent 9a67d3fb98
commit e8bfa13a4f
7 changed files with 77 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/box/box.scss
View file

@ -14,7 +14,7 @@
clear: both;
overflow: hidden;
background-color: #efefef;
background-color: #efefef;
border-radius: 10px 10px 0 0;
border-top: 1px solid white;
border-bottom: 1px solid #ccc;

50
src/components/forms/button.scss
View file

@ -1,27 +1,27 @@
.button {
display: inline-block;
font-size: .8rem;
padding: .75em 1em;
margin: .5em 0;
background-color: #24a3ec;
color: white;
font-weight: bold;
border-radius: 5px;
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);
cursor: pointer;
border: none;
&.white {
background-color: white;
border-top: 1px inset rgba(0, 0, 0, 0.1);
color: #24a3ec;
}
&:hover {
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.25);
}
&:active {
box-shadow: inset 0px 1px 2px rgba(0, 0, 0, 0.25);
}
display: inline-block;
font-size: .8rem;
padding: .75em 1em;
margin: .5em 0;
background-color: #24a3ec;
color: white;
font-weight: bold;
border-radius: 5px;
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);
cursor: pointer;
border: none;
&.white {
background-color: white;
border-top: 1px inset rgba(0, 0, 0, 0.1);
color: #24a3ec;
}
&:hover {
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.25);
}
&:active {
box-shadow: inset 0px 1px 2px rgba(0, 0, 0, 0.25);
}
}

50
src/components/forms/input.scss
View file

@ -1,28 +1,28 @@
.input {
color:black;
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.1);
font-size: .8rem;
padding: .75em 1em;
margin: .5em 0;
background-color: #f7f7f7;
transition:all 1s ease;
&:focus {
background-color: #d3eaf8;
outline:none;
border: 1px solid rgba(0, 0, 0, 0.1);
transition:all 1s ease;
}
&.fail {
border: 1px solid #eab012;
background-color: #fff7df;
}
&.pass {
border: 1px solid #55db58;
background-color: #eafdea;
}
color:black;
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.1);
font-size: .8rem;
padding: .75em 1em;
margin: .5em 0;
background-color: #f7f7f7;
transition:all 1s ease;
&:focus {
background-color: #d3eaf8;
outline:none;
border: 1px solid rgba(0, 0, 0, 0.1);
transition:all 1s ease;
}
&.fail {
border: 1px solid #eab012;
background-color: #fff7df;
}
&.pass {
border: 1px solid #55db58;
background-color: #eafdea;
}
}

8
src/components/login/login.scss
View file

@ -2,8 +2,8 @@
padding: 10px;
label {
padding-top: 5px;
font-weight: bold;
padding-top: 5px;
font-weight: bold;
}
.submit-button {
@ -11,10 +11,10 @@
}
a {
margin-top: 15px;
margin-top: 15px;
}
a:hover {
background-color: transparent !important;
background-color: transparent !important;
}
}

28
src/components/navigation/dropdown.scss
View file

@ -62,20 +62,20 @@
overflow: visible;
&:before {
position: absolute;
display: block;
top: -$arrow-border-width/2;
right: 10%;
height: $arrow-border-width;
width: $arrow-border-width;
content: '';
transform: rotate(45deg);
background-color: $base-background-color;
border-top: 1px solid $active-background-color;
border-left: 1px solid $active-background-color;
border-radius: 5px;
display: block;
top: -$arrow-border-width/2;
right: 10%;
height: $arrow-border-width;
width: $arrow-border-width;
content: '';
transform: rotate(45deg);
background-color: $base-background-color;
border-top: 1px solid $active-background-color;
border-left: 1px solid $active-background-color;
border-radius: 5px;
}
}
}

16
src/components/navigation/navigation.scss
View file

@ -32,7 +32,7 @@
}
.logo {
margin-right: 10px;
margin-right: 10px;
a {
display: block;
width: 81px;
@ -115,12 +115,12 @@
transition: .15s ease background-color;
&::placeholder {
color:rgba(255, 255, 255, 0.75);
color:rgba(255, 255, 255, 0.75);
}
&:focus {
background-color: rgba(0, 0, 0, 0.2);
transition: .15s ease background-color;
background-color: rgba(0, 0, 0, 0.2);
transition: .15s ease background-color;
}
}
@ -170,11 +170,11 @@
}
.account-nav {
.userInfo {
padding-top: 11px;
padding-bottom: 6px;
.userInfo {
padding-top: 11px;
padding-bottom: 6px;
}
> a {
font-weight: normal;
font-size: 0.8125rem;

23
src/main.scss
View file

@ -53,26 +53,3 @@ a:hover {
/* NOTE: Margin should match height in navigation.scss */
margin-top: 50px;
}
/*
button {
cursor: pointer;
line-height: 30px;
border: 1px solid #eee;
border-radius: 5px;
box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
transition: all .25s ease-in-out;
height: 32px;
text-shadow: 0 1px #fff;
font-weight: normal;
color: #666;
border-color: #999;
display: inline-block;
background: linear-gradient(to bottom, #fff, #ccc)
}
button:hover {
background-image: linear-gradient(#e6e6e6,#e6e6e6);
}
*/