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

Cleaned up aside formatting #326

Merged
merged 6 commits into from
Oct 30, 2015
Merged

Cleaned up aside formatting #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89fb785
Cleaned up aside formatting
pcantrell Oct 28, 2015
aee0609
Fixed asymmetry when <p> ends .aside
pcantrell Oct 29, 2015
3b85874
.aside units to px
pcantrell Oct 29, 2015
f346d54
Consolidated .aside-title scss
pcantrell Oct 29, 2015
9981575
Integration specs for aside-formatting-cleanup
pcantrell Oct 29, 2015
12e0912
Updated integration specs to include autolink
pcantrell Oct 29, 2015
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
310 changes: 18 additions & 292 deletions lib/jazzy/assets/css/jazzy.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,53 +26,8 @@ $code_font: 0.95em Menlo, monospace;
$gray_border: 1px solid #e2e2e2;
$declaration_swift_border: 5px solid #cde9f4;

// Asides
$aside_attention_color: #aaa;
$aside_attention_border: 5px solid lighten($aside_attention_color, 20%);
$aside_author_color: #aaa;
$aside_author_border: 5px solid lighten($aside_author_color, 20%);
$aside_authors_color: #aaa;
$aside_authors_border: 5px solid lighten($aside_authors_color, 20%);
$aside_bug_color: #aaa;
$aside_bug_border: 5px solid lighten($aside_bug_color, 20%);
$aside_complexity_color: #aaa;
$aside_complexity_border: 5px solid lighten($aside_complexity_color, 20%);
$aside_copyright_color: #aaa;
$aside_copyright_border: 5px solid lighten($aside_copyright_color, 20%);
$aside_date_color: #aaa;
$aside_date_border: 5px solid lighten($aside_date_color, 20%);
$aside_experiment_color: #aaa;
$aside_experiment_border: 5px solid lighten($aside_experiment_color, 20%);
$aside_important_color: #aaa;
$aside_important_border: 5px solid lighten($aside_important_color, 20%);
$aside_invariant_color: #aaa;
$aside_invariant_border: 5px solid lighten($aside_invariant_color, 20%);
$aside_note_color: #aaa;
$aside_note_border: 5px solid lighten($aside_note_color, 20%);
$aside_parameter_color: #aaa;
$aside_parameter_border: 5px solid lighten($aside_parameter_color, 20%);
$aside_postcondition_color: #aaa;
$aside_postcondition_border: 5px solid lighten($aside_postcondition_color, 20%);
$aside_precondition_color: #aaa;
$aside_precondition_border: 5px solid lighten($aside_precondition_color, 20%);
$aside_remark_color: #aaa;
$aside_remark_border: 5px solid lighten($aside_remark_color, 20%);
$aside_requires_color: #aaa;
$aside_requires_border: 5px solid lighten($aside_requires_color, 20%);
$aside_returns_color: #aaa;
$aside_returns_border: 5px solid lighten($aside_returns_color, 20%);
$aside_see_color: #aaa;
$aside_see_border: 5px solid lighten($aside_see_color, 20%);
$aside_seealso_color: #aaa;
$aside_seealso_border: 5px solid lighten($aside_seealso_color, 20%);
$aside_since_color: #aaa;
$aside_since_border: 5px solid lighten($aside_since_color, 20%);
$aside_todo_color: #aaa;
$aside_todo_border: 5px solid lighten($aside_todo_color, 20%);
$aside_throws_color: #aaa;
$aside_throws_border: 5px solid lighten($aside_throws_color, 20%);
$aside_version_color: #aaa;
$aside_version_border: 5px solid lighten($aside_version_color, 20%);
$aside_color: #aaa;
$aside_border: 5px solid lighten($aside_color, 20%);
$aside_warning_color: #ff0000;
$aside_warning_border: 5px solid lighten($aside_warning_color, 20%);

Expand Down Expand Up @@ -314,13 +269,6 @@ header {
overflow-x: auto;
}

.aside-title {
font-size: 9px;
letter-spacing: 2px;
text-transform: uppercase;
padding-bottom: 0;
}

.declaration .highlight {
overflow-x: initial; // This allows the scrollbar to show up inside declarations
padding: 0 40px 40px 0;
Expand Down Expand Up @@ -406,258 +354,36 @@ header {
}
}

// Asides

div.Swift {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $declaration_swift_border;
overflow-y: hidden;
.aside-title {
color: $declaration_lang_title_swift_color;
-webkit-user-select: none;
}
}

div.attention {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_attention_border;
overflow-y: hidden;
.aside-title {
color: $aside_attention_color;
-webkit-user-select: none;
}
}

div.author {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_author_border;
overflow-y: hidden;
.aside-title {
color: $aside_author_color;
-webkit-user-select: none;
}
}

div.authors {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_authors_border;
overflow-y: hidden;
.aside-title {
color: $aside_authors_color;
-webkit-user-select: none;
}
}

div.bug {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_bug_border;
overflow-y: hidden;
.aside-title {
color: $aside_bug_color;
-webkit-user-select: none;
}
}

div.complexity {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_complexity_border;
overflow-y: hidden;
.aside-title {
color: $aside_complexity_color;
-webkit-user-select: none;
}
}

div.copyright {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_copyright_border;
overflow-y: hidden;
.aside-title {
color: $aside_copyright_color;
-webkit-user-select: none;
}
}

div.date {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_date_border;
overflow-y: hidden;
.aside-title {
color: $aside_date_color;
-webkit-user-select: none;
}
}

div.experiment {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_experiment_border;
overflow-y: hidden;
.aside-title {
color: $aside_experiment_color;
-webkit-user-select: none;
}
}

div.important {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_important_border;
overflow-y: hidden;
.aside-title {
color: $aside_important_color;
-webkit-user-select: none;
}
}

div.invariant {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_invariant_border;
overflow-y: hidden;
.aside-title {
color: $aside_invariant_color;
-webkit-user-select: none;
}
}

div.note {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_note_border;
overflow-y: hidden;
.aside-title {
color: $aside_note_color;
-webkit-user-select: none;
}
}

div.postcondition {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_postcondition_border;
overflow-y: hidden;
.aside-title {
color: $aside_postcondition_color;
-webkit-user-select: none;
}
}

div.precondition {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_precondition_border;
overflow-y: hidden;
.aside-title {
color: $aside_precondition_color;
-webkit-user-select: none;
}
}

div.remark {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_remark_border;
overflow-y: hidden;
.aside-title {
color: $aside_remark_color;
-webkit-user-select: none;
}
}

div.requires {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_requires_border;
overflow-y: hidden;
.aside-title {
color: $aside_requires_color;
-webkit-user-select: none;
}
}

div.see {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_see_border;
.aside, .Swift {
padding: 6px 12px;
margin: 12px 0;
border-left: $aside_border;
overflow-y: hidden;
.aside-title {
color: $aside_see_color;
-webkit-user-select: none;
}
}

div.seealso {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_seealso_border;
overflow-y: hidden;
.aside-title {
color: $aside_seealso_color;
-webkit-user-select: none;
}
}

div.since {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_since_border;
overflow-y: hidden;
.aside-title {
color: $aside_since_color;
-webkit-user-select: none;
}
}

div.todo {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_todo_border;
overflow-y: hidden;
.aside-title {
color: $aside_todo_color;
font-size: 9px;
letter-spacing: 2px;
text-transform: uppercase;
padding-bottom: 0;
margin: 0;
color: $aside_color;
-webkit-user-select: none;
}
}

div.throws {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_throws_border;
overflow-y: hidden;
.aside-title {
color: $aside_throws_color;
-webkit-user-select: none;
p:last-child {
margin-bottom: 0;
}
}

div.version {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
border-left: $aside_version_border;
overflow-y: hidden;
.Swift {
border-left: $declaration_swift_border;
.aside-title {
color: $aside_version_color;
-webkit-user-select: none;
color: $declaration_lang_title_swift_color;
}
}

div.warning {
padding: 4px 0 2px 10px;
margin-bottom: 1em;
.aside-warning {
border-left: $aside_warning_border;
overflow-y: hidden;
.aside-title {
color: $aside_warning_color;
-webkit-user-select: none;
}
}

Expand Down
4 changes: 2 additions & 2 deletions lib/jazzy/jazzy_markdown.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def list_item(text, _list_type)
end

def render_aside(type, text)
%(<div class="#{type}">
<p class="aside-title">#{type}</p>
%(<div class="aside aside-#{type.underscore.gsub('_', '-')}">
<p class="aside-title">#{type.underscore.humanize}</p>
#{text}
</div>)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Open in desktop
Submodule integration_specs updated 34 files
+4 −4 document_alamofire/after/docs/Classes/MultipartFormData.html
+21 −208 document_alamofire/after/docs/css/jazzy.css
+4 −4 ...t_alamofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/Classes/MultipartFormData.html
+21 −208 document_alamofire/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/css/jazzy.css
+21 −208 document_alamofire1.2/after/docs/css/jazzy.css
+21 −208 document_alamofire1.2/after/docs/docsets/Alamofire.docset/Contents/Resources/Documents/css/jazzy.css
+21 −208 document_moya_podspec/after/docs/css/jazzy.css
+21 −208 document_moya_podspec/after/docs/docsets/Moya.docset/Contents/Resources/Documents/css/jazzy.css
+2 −2 document_realm_swift/after/docs/Classes.html
+8 −8 document_realm_swift/after/docs/Classes/AnyRealmCollection.html
+40 −40 document_realm_swift/after/docs/Classes/List.html
+2 −2 document_realm_swift/after/docs/Classes/Object.html
+10 −10 document_realm_swift/after/docs/Classes/Realm.html
+10 −10 document_realm_swift/after/docs/Classes/Results.html
+2 −2 document_realm_swift/after/docs/Functions.html
+8 −8 document_realm_swift/after/docs/Protocols/RealmCollectionType.html
+1 −1 document_realm_swift/after/docs/Typealiases.html
+21 −208 document_realm_swift/after/docs/css/jazzy.css
+2 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes.html
+8 −8 ...alm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/AnyRealmCollection.html
+40 −40 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/List.html
+2 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/Object.html
+10 −10 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/Realm.html
+10 −10 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Classes/Results.html
+2 −2 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Functions.html
+8 −8 ..._swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Protocols/RealmCollectionType.html
+1 −1 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Typealiases.html
+21 −208 document_realm_swift/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/css/jazzy.css
+1 −1 document_realm_swift1.2/after/docs/Typealiases.html
+21 −208 document_realm_swift1.2/after/docs/css/jazzy.css
+1 −1 document_realm_swift1.2/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/Typealiases.html
+21 −208 document_realm_swift1.2/after/docs/docsets/RealmSwift.docset/Contents/Resources/Documents/css/jazzy.css
+21 −208 misc_jazzy_features/after/docs/css/jazzy.css
+21 −208 misc_jazzy_features/after/docs/docsets/MiscJazzyFeatures.docset/Contents/Resources/Documents/css/jazzy.css