Skip to content

Apply website redesign rfc styles #645

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.

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

Closed
wants to merge 12 commits into from
12 changes: 0 additions & 12 deletions app/components/main-footer.js

This file was deleted.

3 changes: 0 additions & 3 deletions app/styles/_class.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ article.chapter {
.attribute-label {
display: inline-block;
width: 120px;
color: $black;
font-weight: bold;
text-transform: uppercase;

@media (max-width: $mobile-portrait-screen){
display: block;
Expand Down
40 changes: 0 additions & 40 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,47 +1,7 @@
@charset "utf-8";

@import "normalize";
@import "bourbon";
@import "./base/base";
@import "neat";
@import "./components/all";
@import "class";

body {
margin: 0;
width: 100%;
}

@include media($large-screen-up) {
.header {
top: 0;
width: 100%;
}

main.container {
width: 100%;
min-height: calc(100vh - 18rem);
}

main.container .content {
position: relative;
margin-right: 0;
margin-bottom: 0;
overflow:auto;
padding: $base-spacing;
min-width: auto;
&::after {
clear: both;
display: table;
}

}

main.container .content .chapter {
width: 800px;
max-width: 100%;
}
}


@import "ember-power-select";
2 changes: 0 additions & 2 deletions app/styles/base/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ button {
color: #fff;
cursor: pointer;
display: inline-block;
font-family: $base-font-family;
font-size: $base-font-size;
font-weight: 600;
line-height: 1;
padding: 0.75em 1em;
Expand Down
6 changes: 0 additions & 6 deletions app/styles/base/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ input,
label,
select {
display: block;
font-family: $base-font-family;
font-size: $base-font-size;
}

.ember-power-select-trigger {
Expand All @@ -19,8 +17,6 @@ select {
max-width: 100%;
width: auto;
display: block;
font-family: $base-font-family;
font-size: $base-font-size;
background-color: $base-background-color;
transition: border-color;
appearance: none;
Expand All @@ -46,8 +42,6 @@ textarea {
border-radius: $base-border-radius;
box-shadow: $form-box-shadow;
box-sizing: border-box;
font-family: $base-font-family;
font-size: $base-font-size;
margin-bottom: $base-spacing / 2;
padding: $base-spacing / 3;
transition: border-color;
Expand Down
9 changes: 1 addition & 8 deletions app/styles/base/_grid-settings.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
// Neat Overrides
// $column: 90px;
// $gutter: 30px;
// $grid-columns: 12;
// $max-width: 1088px;
// Neat Breakpoints
$mobile-portrait-screen: 30em; // 480px
$medium-screen: 40em; // 640px
$large-screen: 54em; // 864px
$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$medium-large-screen-up: new-breakpoint(min-width $medium-screen 8);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
26 changes: 3 additions & 23 deletions app/styles/base/_lists.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
ul,
ol {
list-style-type: none;
margin: 0;
padding: 0;

&%default-ul {
list-style-type: disc;
margin-bottom: $small-spacing;
padding-left: $base-spacing;

Expand All @@ -15,11 +13,9 @@ ol {
}

&%default-ol {
list-style-type: none;
margin-bottom: $base-spacing;

> li {
counter-increment: customlistcounter;
clear: both;
padding: $small-spacing 0 $small-spacing 2em;
position: relative;
Expand All @@ -28,33 +24,17 @@ ol {
&::before {
@include position(absolute, ($small-spacing + 0.5em) null null 0);
@include size(2em);
content: counter(customlistcounter) " ";
border: 2px solid $base-border-color;
border: 2px solid #74B0CE;
border-radius: 50%;
color: $light-brown;
float: left;
font-size: $small-font-size;
line-height: calc(2em - 4px);
overflow: hidden;
text-align: center;
}
}

&:first-child {
counter-reset: customlistcounter;
}
}
}

dl {
margin-bottom: $small-spacing;

dt {
font-weight: bold;
margin-top: $small-spacing;
}

dd {
margin: 0;
}
dd {
margin: 0;
}
38 changes: 1 addition & 37 deletions app/styles/base/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,54 +1,18 @@
@import "mixins/hidpi";
@import "mixins/text-adjust";

body {
font-feature-settings: "kern", "liga", "pnum";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: $base-font-color;
font-family: $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
}

h1,
h2,
h3,
h4,
h5,
h6 {
font-family: $heading-font-family;
font-size: $base-font-size;
line-height: $heading-line-height;
margin: 0 0 $small-spacing;
font-weight: bold;

code {
text-transform: none;
}
}

@each $i in 0, 1, 2, 3, 4 {
h#{$i + 1} {
font-size: modular-scale(-$i, 2em, 1.2);
}
}

h1 {
color: $ember-orange;
}

h2 {
color: $brown;
}

p {
margin: 1.5em 0 $small-spacing;
line-height: 1.5em;
}

a {
color: $action-color;
text-decoration: none;
transition: color 0.1s linear;

Expand All @@ -64,7 +28,7 @@ a {
}

hr {
border-bottom: $base-border;
border-bottom: 1px solid #e6e4e3;
border-left: none;
border-right: none;
border-top: none;
Expand Down
11 changes: 0 additions & 11 deletions app/styles/base/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
// Typography
$base-font-family: 'Source Sans Pro', sans-serif;
$heading-font-family: $base-font-family;
$monospace-font-family: Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, monospace;
$footer-font-family: proxima-nova, sans-serif;

// Font Sizes
$base-font-size: 1rem;
$small-font-size: 0.75rem;
$large-font-size: 1.5rem;

// Line height
$base-line-height: 1.5;
Expand All @@ -22,8 +14,6 @@ $top-spacing: $base-spacing * 3.333; // 80px

// Colors
$ember-orange: #dd6a58;
$light-brown: #b67d47;
$brown: #865931;
$medium-gray: #999;
$dark-gray: #444545;
$tan: #fffdf9;
Expand Down Expand Up @@ -63,7 +53,6 @@ $highlight-colors: (
// Font Colors
$base-font-color: $near-black;
$dark-font-color: $dark-gray;
$light-font-color: $light-brown;
$action-color: $ember-orange;

// Border
Expand Down
2 changes: 1 addition & 1 deletion app/styles/colors.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$ember-orange: #dd6a58;
$ember-orange: #e04e39;

2 changes: 0 additions & 2 deletions app/styles/components/_all.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "header";
@import "footer";
@import "layout";
@import "sidebar";
@import "article";
Expand Down
2 changes: 0 additions & 2 deletions app/styles/components/_article.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ article {

.edit-page {
@include size(24px, 18px);
color: $brown;
display: inline-block;
float: right;
font-size: 1rem;
margin: 0.5em 0 0 0;
opacity: 0.4;
overflow: hidden;
Expand Down
4 changes: 2 additions & 2 deletions app/styles/components/_back-to-top.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
margin-left: 1em;
text-align: center;

@include media(max-width 89em) {
@media (max-width: 89em) {
@include size(1.5em);
overflow: hidden;
}

@include media(max-width 78em) {
@media (max-width: 78em) {
height: 0;
}
}
10 changes: 0 additions & 10 deletions app/styles/components/_class-field-desc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
}

.args {
color: $light-brown;
font-style: italic;
font-weight: normal;
font-size: $base-font-size;
}

.class-field-description--link .return-type,
Expand All @@ -23,23 +21,17 @@
color: $medium-gray;
font-style: italic;
font-weight: normal;
font-size: $base-font-size;
margin-right: 5px;
}

.access {
color: white;
background-color: gray;
padding: 2px 7px;
font-size: 1.6em;
font-weight: 600;
border-radius: 3px;
}

h3 .access{
font-size: smaller;
}

.parameters {
dl {
display: inline-block;
Expand All @@ -62,12 +54,10 @@ h3 .access{

p.github-link {
margin: -12px 0 0;
font-size: $small-font-size;
}

p.field-since {
margin: 0;
font-size: $small-font-size;
}

.class-field-description--link {
Expand Down
Loading