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

[IMPROVE] border-radius to use --border-radius #12675

Merged
merged 4 commits into from
Nov 20, 2018
Merged

[IMPROVE] border-radius to use --border-radius #12675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8460ecb
fix multiple border-radius to use --border-radius
engelgabriel Nov 20, 2018
9d1282e
fix multiple border-radius to use --border-radius
engelgabriel Nov 20, 2018
370e90a
fix multiple border-radius to use --border-radius
engelgabriel Nov 20, 2018
4f6697c
Merge branch 'develop' into border-radius
engelgabriel Nov 20, 2018
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
6 changes: 0 additions & 6 deletions packages/rocketchat_theme/client/imports/components/emojiPicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,11 @@
& .rc-input__icon {
left: 0.5rem;
}

& .rc-input__element {
padding: 0.5rem 1rem 0.5rem 2rem;
}
}

.emoji-top {
display: flex;

margin: 0 -0.3rem;
padding: 5px;
align-items: center;

& .rc-input {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat_theme/client/imports/components/messages.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
&__button {
margin: 0 0.2rem;

font-size: inherit;

&:hover {
color: var(--rc-color-button-primary);
}
Expand Down
53 changes: 24 additions & 29 deletions packages/rocketchat_theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
word-wrap: break-word;

border-width: 1px;
border-radius: 4px;
border-radius: var(--border-radius);

font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 13px;
Expand All @@ -34,8 +34,7 @@
&.inline {
display: inline;

margin: 0 0.1em;
padding: 0 0.5em;
padding: 0.1rem 0.2rem;

line-height: 16px;
}
Expand Down Expand Up @@ -164,7 +163,7 @@
margin-bottom: 20px;

border-width: 1px;
border-radius: 4px;
border-radius: var(--border-radius);
}

.rc-old .full-page .hidden {
Expand Down Expand Up @@ -542,7 +541,7 @@ rc-old select,
text-transform: uppercase;

border-width: 0;
border-radius: 4px;
border-radius: var(--border-radius);

font-size: 14px;
font-weight: 500;
Expand Down Expand Up @@ -824,7 +823,7 @@ rc-old select,

content: " ";

border-radius: 4px;
border-radius: var(--border-radius);
}

& .avatar-initials {
Expand Down Expand Up @@ -1127,7 +1126,7 @@ rc-old select,
padding: 0 8px 0 30px;

border-width: 1px;
border-radius: 4px;
border-radius: var(--border-radius);
box-shadow: 0 0 0;
appearance: none;
}
Expand Down Expand Up @@ -1737,7 +1736,7 @@ rc-old select,
margin: 40px auto;
padding: 20px;

border-radius: 4px;
border-radius: var(--border-radius);
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);

& .cms-page-close {
Expand Down Expand Up @@ -1858,8 +1857,6 @@ rc-old select,
}

& .settings-description {
padding: 5px;

line-height: 1.2rem;
}

Expand Down Expand Up @@ -1978,7 +1975,7 @@ rc-old select,
padding: 20px;

border-width: 1px;
border-radius: 4px;
border-radius: var(--border-radius);

& .section-helper {
padding: 20px 20px 40px;
Expand Down Expand Up @@ -2148,7 +2145,7 @@ rc-old select,
transform: translateY(-10px);

opacity: 0;
border-radius: 4px;
border-radius: var(--border-radius);
box-shadow:
0 1px 1px 0 rgba(0, 0, 0, 0.2),
0 2px 10px 0 rgba(0, 0, 0, 0.16);
Expand Down Expand Up @@ -2909,7 +2906,7 @@ rc-old select,
}

& .editing .body {
border-radius: 4px;
border-radius: var(--border-radius);
}

&.selectable .message {
Expand Down Expand Up @@ -3031,7 +3028,7 @@ rc-old select,
transition: transform 0.15s ease-in-out, opacity 0.15s ease-in-out;
animation: dropdown-in 0.15s ease-in-out;

border-radius: 4px;
border-radius: var(--border-radius);
box-shadow:
0 1px 1px 0 rgba(0, 0, 0, 0.2),
0 2px 10px 0 rgba(0, 0, 0, 0.16);
Expand Down Expand Up @@ -3124,7 +3121,7 @@ rc-old select,

border-width: 1px;

border-radius: 4px;
border-radius: var(--border-radius);
background: #ffffff;
}
}
Expand Down Expand Up @@ -3604,7 +3601,7 @@ body:not(.is-cordova) {
padding: 20px;

border: 1px solid #dddddd;
border-radius: 4px;
border-radius: var(--border-radius);
background-color: #ffffff;
}

Expand Down Expand Up @@ -3870,7 +3867,7 @@ body:not(.is-cordova) {
content: " ";
vertical-align: middle;

border-radius: 4px;
border-radius: var(--border-radius);
}
}

Expand Down Expand Up @@ -4358,7 +4355,7 @@ body:not(.is-cordova) {
text-align: left;

opacity: 0;
border-radius: 4px;
border-radius: var(--border-radius);
box-shadow: 4px 4px 0 rgba(0, 0, 0, 0.15);

& header {
Expand Down Expand Up @@ -4819,15 +4816,15 @@ body:not(.is-cordova) {

padding: 0 4px 2px;

border-radius: 4px;
border-radius: var(--border-radius);

font-weight: bold;
}

.rc-old .highlight-text {
padding: 2px;

border-radius: 4px;
border-radius: var(--border-radius);
}

.rc-old .avatar-suggestions {
Expand All @@ -4846,7 +4843,7 @@ body:not(.is-cordova) {
text-align: left;

border-width: 1px;
border-radius: 4px;
border-radius: var(--border-radius);
align-items: center;
flex-flow: row nowrap;

Expand Down Expand Up @@ -5195,14 +5192,14 @@ body:not(.is-cordova) {

.rc-old .colorpicker-swatch {
position: absolute;
top: 2px;
left: 2px;
top: 4px;
left: 4px;

display: block;
overflow: hidden;

width: 41px;
height: 41px;
width: 32px;
height: 32px;

border-radius: 2px;
}
Expand Down Expand Up @@ -5370,9 +5367,7 @@ body:not(.is-cordova) {
}

& .buttons {
margin-top: 10px;

text-align: right;
margin: 10px 0;
}

& .CodeMirror {
Expand Down Expand Up @@ -5728,7 +5723,7 @@ body:not(.is-cordova) {

color: #555555;
border: 1px solid #eaeaea;
border-radius: 4px;
border-radius: var(--border-radius);

font-family: arial;
font-size: 14px;
Expand Down