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

Jump to bottom

Fix spacing and reactions alignment in Keystone/Boilerplate #10029

Merged
merged 1 commit into from Feb 4, 2020
Merged

Fix spacing and reactions alignment in Keystone/Boilerplate #10029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_cerulean.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_cerulean.css.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_classic.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_classic.css.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_coral.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_coral.css.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_dark.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_dark.css.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_default.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_default.css.map
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions addons/themes/keystone/design/custom_dusk.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/keystone/design/custom_dusk.css.map
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions addons/themes/theme-boilerplate/design/custom.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion addons/themes/theme-boilerplate/design/custom.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/vanilla-theme-core/scss/components/_ideation.scss
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
.PhotoWrap.IndexPhoto,
.idea-counter-module .idea-counter-box {
margin: 0;
width: $theme-photo_size;
height: $theme-photo_size;
}


}
19 changes: 16 additions & 3 deletions packages/vanilla-theme-core/scss/components/_lists.scss
View file
Open in desktop
Expand Up @@ -163,7 +163,6 @@
font-size: inherit;
font-weight: inherit;
color: inherit;
margin: 0 $utility-baseUnit;
display: inline-block;

a {
Expand All @@ -182,6 +181,14 @@
}
}

.Tag,
.MItem {
margin: {
left: $utility-baseUnit;
right: $utility-baseUnit;
}
}

.MItem.Hidden {
display: none;
}
Expand Down Expand Up @@ -272,10 +279,16 @@
.ItemIdea.ItemIdea.ItemIdea {
.PhotoWrap.IndexPhoto,
.idea-counter-module .idea-counter-box {
margin: 0 $utility-baseUnitHalf 0 0;
margin: 0 $utility-baseUnitDouble 0 0;
width: $theme-photo_size;
height: $theme-photo_size;
}

.Meta {
.ViewCount {
margin-left: 0;
}
}
}

//Warnings and Notes
Expand Down Expand Up @@ -401,7 +414,7 @@

//overwrite indexphoto plugin styles
.ItemDiscussion-withPhoto.ItemDiscussion-withPhoto .Discussion.ItemContent {
padding-left: calc(#{$theme-photo_size} + #{$component-base_padding});
padding-left: calc(#{$theme-photo_size} + #{$utility-baseUnitDouble});
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/vanilla-theme-core/scss/components/_reactions.scss
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@ $reactions_bg: rgba(0,0,0,0.5) !default;
.RecordReactions {
margin-left: -$utility-baseUnitHalf;
margin-right: -$utility-baseUnitHalf;
display: flex;
flex-wrap: wrap;

.PhotoWrap {
position: relative;
Expand Down
6 changes: 1 addition & 5 deletions packages/vanilla-theme-core/scss/components/_tables.scss
View file
Open in desktop
Expand Up @@ -48,10 +48,6 @@
width: inherit;
display: table;

@include maxWidth {
display: none;
}

tr {
border: none;
}
Expand Down Expand Up @@ -508,7 +504,7 @@
}

.Wrap {
padding-left: $theme-photo_size;
padding-left: calc(#{$theme-photo_size} + #{$utility-baseUnitDouble});
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vanilla-theme-core/scss/components/_userContent.scss
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ $code-block_padding: $userContent_fontSize !default;
}
}

p img {
.embedImage-img {
position: relative;
margin: 0 auto;
display: block;
Expand Down
22 changes: 17 additions & 5 deletions packages/vanilla-theme-core/scss/pages/_entry.scss
View file
Open in desktop
Expand Up @@ -25,17 +25,17 @@ body.Section-Entry {
}

.ForgotPassword {
margin-left: 0;
margin-left: $utility-baseUnit;
}

.ForgotPassword,
.CreateAccount a {
color: $component-meta-link_color;
color: $link-default_color;

&:focus,
&:hover {
text-decoration: $theme-link-hover_textDecoration;
color: $component-meta-link-hover_color;
color: $link-default-hover_color;
}
}

Expand All @@ -45,12 +45,12 @@ body.Section-Entry {

a {
font-size: inherit;
color: $component-meta-link_color;
color: $link-default_color;

&:focus,
&:hover {
text-decoration: $theme-link-hover_textDecoration;
color: $component-meta-link-hover_color;
color: $link-default-hover_color;
}
}
}
Expand All @@ -73,6 +73,18 @@ body.Section-Entry {
margin-bottom: $component-item_spacing;
}

.Methods {
a {
color: $link-default_color;

&:hover,
&:focus,
&:active {
color: $link-default-hover_color;
}
}
}

.MainForm {
.InputBox {
max-width: 100%;
Expand Down
1 change: 0 additions & 1 deletion packages/vanilla-theme-core/scss/patches/_core-patches.scss
View file
Open in desktop
Expand Up @@ -171,7 +171,6 @@ body {
align-items: center;
justify-content: center;
height: $icon-default_size;
width: $icon-default_size;

input {
margin: 0;
Expand Down