finish merge on cleaned up news feed

This commit is contained in:
Kyle Drake 2016-07-29 14:10:29 -07:00
commit 4ca2e3f443
205 changed files with 6131 additions and 2295 deletions

View file

@ -14,7 +14,7 @@
}
.row.header-Content.content {
padding-bottom:27px;
padding-bottom: 31px;
}
.header-Content.content{
@ -28,7 +28,7 @@
background:url(/img/neocity.png) 95% bottom no-repeat;
background-size: 734px;
min-height:214px;
@media (max-device-width:480px), screen and (max-width:800px){
@include vendor(background-size, cover);
min-height:2px;
@ -64,7 +64,7 @@
color: #B8D375;
font-size: .9em;
margin-bottom: 1.8em;
a {
color: #B8D375;
border-bottom: 1px solid rgba(184, 211, 117, 0.5);
@ -90,7 +90,7 @@
@include vendor(transform, scaleX(-1));
width: 100px;
margin-right: 25px;
&.float-Right {
margin-left: 10px;
}
@ -107,19 +107,19 @@
margin-bottom:20px;
padding:4px 20px 4px 14px;
}
li{
padding-left:$spacing*9;
padding-right:$spacing*3;
margin-bottom:20px;
margin-left: 8px;
}
h3 {
margin-bottom: 0px;
font-size: 1.7em;
}
p {
color:#B2BCC1;
line-height: 170%;
@ -139,14 +139,14 @@
.intro-Tools{position:relative}
.intro-Question{
position:relative;
.intro-Icon{
background-position:0 -40px;
}
}
}
.intro-Social {
position:relative;
.intro-Icon {
background-position: 0 -80px;
}
@ -166,7 +166,7 @@
position:absolute;
top: -40px;
margin-bottom: 15px;
@media (max-device-width:480px), screen and (max-width:800px){
height:auto;
margin:0;
@ -175,35 +175,35 @@
position:static;
width:100%;
}
h2{
margin-bottom:0;
text-shadow:0 1px 1px rgba(0,0,0,.5);
font-size: 1.8em;
}
hr{
border-bottom:1px solid #4a6677;
border-top:1px solid #1d282d;
margin: 4px 0 21px;
}
fieldset{
padding: 25px 33px;
background:url(/img/sign-up-bg.png) repeat-x center top;
background:url(/img/sign-up-bg.png) repeat-x center top;
border-radius: 4px 4px 0 0;
}
label{
color:#81b8c6;
}
label#domain-name {
display: inline;
vertical-align: 8px;
color: #C2CFD4;
}
.input-Area{
background:#29383f;
border:0 solid black;
@ -213,7 +213,7 @@
margin-right:$spacing;
padding: 10px 10px 7px 10px;
width:100%;
// &:focus{color:#eee}
}
.input-Area#create-Input {
@ -223,7 +223,7 @@
margin-left: 0;
position: static;
}
.tooltip {
.tooltip {
&.left .tooltip-arrow {
border-left-color: #971D31;
}
@ -249,41 +249,41 @@
.header-Nav{
background:#5e95a1;
border-bottom:1px solid #92B4BD;
@include vendor(transition, all 0.35s);
@media (max-device-width:480px), screen and (max-width:800px){
position:fixed;
top:-900px!important;
}
&.show-Nav{
top:0!important;
padding-bottom: 2px;
}
a, a:visited{
color:#fff;
padding:$spacing*2 $spacing*3;
color:#fff;
padding:$spacing*2 $spacing*3;
text-decoration:none;
@media (max-device-width:480px), screen and (max-width:800px){
display:block;
}
>.fa-heart {
vertical-align: .5em;
margin-left: .3em;
font-size: 9px;
position: relative;
position: relative;
color: rgba(255, 255, 255, 0.4);
display: inline-block;
>.fa-heart {
display:none;
}
}
&:hover{
background:#528995; text-decoration:underline;
>.fa-heart {
@ -300,7 +300,7 @@
}
&.selected, &:active{background:#528995; text-decoration:underline}
}
a.small-Nav{
background: #65a0ad;
display:none;
@ -311,28 +311,28 @@
height:36px;
z-index:9999;
padding: 5px 12px 0px 12px;
@media (max-device-width:480px), screen and (max-width:800px){
display:block;
}
}
.notification-value {
background: $c-Brand-1;
padding: 2px 5px;
@include border-radius(4px);
}
.dropdown {
height: 2.6em; //not sure why I need this :/
a {
width:100%;
}
.info {
float:right;
margin-left: 10px;
.fa-caret-down {
margin-left:10px;
}
@ -345,10 +345,10 @@
min-width: 13em;
@include border-radius(0px 0px 6px 6px);
@include box-shadow(0 2px 7px rgba(0,0,0,0.2));
li {
width:100%;
a {
float:left;
}
@ -367,21 +367,21 @@
}
.dropdown-submenu {
float: left;
&:hover > a, &:focus > a {
background:#3C6670;
}
.dropdown-menu {
width: 100%;
margin-left: -1px;
margin-top: -1px;
li {
overflow: hidden;
}
}
>a:after {
border-left-color: #fff;
}
@ -390,27 +390,27 @@
.constant-Nav{
float:left;
position:relative;
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
li{float:none;}
}
}
.status-Nav{
float:right;
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
}
li{
float:left;
@media (max-device-width:480px), screen and (max-width:800px){
float:none
}
}
}
}
// hp CSS
@ -429,12 +429,12 @@
left:-90px;
position:fixed;
@include vendor(transition, all 0.35s);
&.in-View{
left:0!important;
z-index:99;
@media (max-device-width:480px), screen and (max-width:800px){
left:-90px!important;
}
@ -456,11 +456,11 @@
@media (max-device-width:480px), screen and (max-width:800px){
margin-left:0;
}
&.in-View{
margin-left:0;
padding-left:70px;
@media (max-device-width:480px), screen and (max-width:800px){
padding-left:0
}
@ -504,7 +504,7 @@
padding-left:74px;
@media (max-device-width:480px), screen and (max-width:800px){
width:100%;
}
}
}
.interior .constant-Nav, .hp.education .constant-Nav{margin:0}

View file

@ -187,7 +187,7 @@
@media (max-device-width:480px), screen and (max-width:800px) {
width: 100%;
height: 300px;
height: 200px;
}
}
.interior .header-Outro .screenshot.dashboard {
@ -256,16 +256,16 @@
width: 100%;
position: relative;
margin-top: 7px;
.column, input[type='checkbox'] {
display: none;
}
.btn-group {
float: left;
margin-right: 15px;
margin-left: -3px;
>.btn+.btn {
margin-left: 0px;
border-left: 1px solid rgba(0, 0, 0, 0.1);
@ -276,9 +276,6 @@
background: #77ABB8;
@include box-shadow(0 0 5px rgba(0, 0, 0, 0.2));
&:hover {
background: #83B3C0;
}
&:focus, &.active {
outline: 0;
background: #4F727B;
@ -323,11 +320,11 @@
}
.files .actions {
float: right;
@media (max-device-width:480px), screen and (max-width:800px) {
float: left;
margin-top: 7px;
.fa {
display: none;
}
@ -525,7 +522,7 @@
}
@mixin dashboard-list-view {
padding: 0;
.upload-Boundary {
padding: 0;
border: 0;
@ -535,20 +532,20 @@
padding: 10px 20px;
margin: 0;
width: 100%;
&:nth-child(even) {
background: #EFE8DC;
}
.title {
margin: 0;
margin-left: 7px;
margin-left: 9px;
margin-top: 2px;
float: left;
font-size: 14px;
text-align: left;
width: 30%;
text-overflow: ellipsis;
@media (max-device-width:480px), screen and (max-width:800px) {
width: 33%;
}
@ -562,14 +559,13 @@
}
.html-thumbnail, .misc-icon {
margin: 0;
margin-left: 4px;
float: left;
width: 23px;
height: 23px;
background-size: 23px;
padding: 0;
font-size: 8px;
img {
max-width: 23px;
max-height: 23px;
@ -590,7 +586,7 @@
background-color: transparent;
display: block;
width: 94%;
a {
color: #e93250;
display: inline;
@ -599,7 +595,7 @@
.link-overlay {
width: 30%;
}
@media (max-device-width:480px), screen and (max-width:800px) {
width: 84%;
}
@ -613,7 +609,7 @@
font-size: 13px;
display: block;
padding-top: 4px;
@media (max-device-width:480px), screen and (max-width:800px) {
display: none;
}
@ -756,10 +752,9 @@
}
}
@media (max-device-width:480px), screen and (max-width:800px) {
width: 10em!important;
float: right;
padding: 0 0 18px 0;
margin-top: -77px;
position: absolute;
top: 46px;
right: -8px;
}
}
.interior .header-Outro.with-columns .col-66 {
@ -820,6 +815,7 @@
@media (max-device-width:480px), screen and (max-width:800px) {
width: 60%;
height: 160px;
}
}
.site-portrait {
@ -958,7 +954,7 @@ a.tag:hover {
position: relative;
width: 100%;
float: left;
.text {
float: left;
margin-top: .45em;
@ -984,17 +980,17 @@ a.tag:hover {
padding: 0;
margin-left: 0;
margin-right: 17px;
.html-thumbnail {
width: 102px;
}
&:first-child .html-thumbnail.html {
width: 322px;
height: 100px;
width: 540px;
height: 405px;
}
&:first-child .html-thumbnail.html img {
width: 322px;
height: 200px;
width: 540px;
height: 405px;
}
}
.news-item .file .image-container {
@ -1020,6 +1016,7 @@ a.tag:hover {
.news-item .comments .actions, .news-item .comments p {
margin-left: 47px;
}
.news-item .comments p {
margin-bottom: .4em;
margin-top: .15em;
@ -1867,7 +1864,7 @@ a.tag:hover {
padding-top: 0;
background: #4F7E89;
padding-bottom: 7em;
padding-bottom: 5em;
a {
color: white;
@ -2137,43 +2134,71 @@ table#latest-visitors {
width: 100%;
}
}
.intro-List.kickstarter .col {
padding-top: 1em;
padding-bottom: .8em;
margin-left: 0;
&:first-child{
padding-left: 2px;
.section.thankyou {
text-align: center;
color: #4F7E89;
padding: 6.5em 8% 7em;
a {
color: #4F7E89;
text-decoration: underline;
}
.title {
margin-top: 1%;
}
.title a {
color: white;
font-weight: bold;
text-decoration: none;
img {
margin-bottom: 1em;
}
p {
margin-top: 15px;
font-size: 1em;
margin-bottom: .5em;
margin-top: .5em;
}
}
.welcome.kickstarter {
background: #daeea5 url(/img/tutorialthumbnail.png) no-repeat;
background-position: right center;
background-size: auto 100%;
padding: 15px 100px 4px 23px;
margin-bottom: 13px;
font-size: 95%;
@media (max-device-width:480px), screen and (max-width:800px) {
background-size: 32%;
background-position: right top;
}
h4 {
p:first-child {
font-size: 120%;
margin-bottom: .2em;
a {
color: #2c3e50!important;
}
}
}
ul.thankyou {
list-style: none;
margin-top: 1.5em;
clear: both;
li {
display: inline-block;
width: 32%;
}
}
pre, code {
background: #1d1f21;
color: #FFFFFF;
}
.welcoming-cat {
width: 200px;
float: right;
margin-top: -40px;
}
.section.tutorial-welcome {
padding: 80px 18%;
.option {
margin: 3.5em 0;
}
h3 {
margin-top: 0em;
font-size: 1.3em;
}
p {
font-size: 1.1em;
}
}
.tagcloud .tag10 { font-size: 0.6em; font-weight: 90; }
.tagcloud .tag9 { font-size: 0.7em; font-weight: 100; }
.tagcloud .tag8 { font-size: 0.8em; font-weight: 200; }
.tagcloud .tag7 { font-size: 0.9em; font-weight: 300; }
.tagcloud .tag6 { font-size: 1.0em; font-weight: 400; }
.tagcloud .tag5 { font-size: 1.2em; font-weight: 500; }
.tagcloud .tag4 { font-size: 1.4em; font-weight: 600; }
.tagcloud .tag3 { font-size: 1.6em; font-weight: 700; }
.tagcloud .tag2 { font-size: 1.8em; font-weight: 800; }
.tagcloud .tag1 { font-size: 2.2em; font-weight: 900; }
.tagcloud .tag0 { font-size: 2.5em; font-weight: 900; }

View file

@ -0,0 +1,91 @@
// ----------------------------------------------------------------
// Project Specific: Tutorial
// ----------------------------------------------------------------
.tutorial {
p {
font-size: 1em;
}
.interact {
textarea.editor {
height: 350px!important;
width: 100%;
background-color: #1D1F21;
color: white;
font: 16px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
margin-bottom: 0;
border: 0;
}
h3.editor-heading {
margin-top: 10px;
}
.preview {
height: 300px;
width: 100%;
background-color: gray;
}
.btn {
float: right;
}
.error {
background: #93771b;
color: #fff;
padding: 5px 10px;
font-size: 14px;
}
}
.lesson {
h1, .subtitle {
color: #5e95a1;
}
.subtitle {
font-size: 14px;
margin-top: 0;
text-align: left;
}
.comic {
position: relative;
background-repeat: no-repeat;
}
.dialogue {
width: 180px;
position: absolute;
text-align: center;
&:nth-child(1) {
left: 30px;
top: 30px;
}
&:nth-child(2) {
left: 250px;
top: 30px;
}
&:nth-child(3) {
left: 30px;
top: 250px;
}
&:nth-child(4) {
left: 250px;
top: 250px;
}
pre, code {
padding: 0;
margin: 0;
background: none;
color: #666;
border: none;
display: block;
font-size: 100%;
}
pre {
padding-top: .1em;
}
}
}
.welcome {
pre, code {
background: #16414c;
font-size: 100%;
}
}
}

View file

@ -29,6 +29,7 @@
// Specific Modules
@import '_project-sass/project-Website-Gallery'; // Browse website specific styling
@import '_project-sass/project-Tutorial'; // Tutorial specific styling
// FIXITFIXITFIXITFIXIT
// Only import tidyUp if you actually need to make some quick fix hacks that you don't