Skip to content

fixes #1328 #1597

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

Merged
merged 1 commit into from
Sep 28, 2018
Merged

fixes #1328 #1597

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/shared/components/Settings/Account/MyAccount/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
.form-mobile {
display: none;

@include xs-to-sm {
@include upto-sm {
display: block;

.row {
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/Settings/ToggleableItem/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
line-height: 20px;
margin-bottom: 10px;

@include xs-to-sm {
@include upto-sm {
@include roboto-medium;

font-weight: 500;
Expand All @@ -40,7 +40,7 @@
font-weight: 400;
line-height: 20px;

@include xs-to-sm {
@include upto-sm {
font-size: 11px;
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/shared/components/Settings/Tools/Devices/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ export default class Devices extends ConsentComponent {
<div styleName="field col-1">
<label htmlFor="deviceType">
Device Type
<span styleName="text-required">* Required</span>
</label>
<Select
name="deviceType"
Expand All @@ -408,6 +409,7 @@ export default class Devices extends ConsentComponent {
<div styleName="field col-1">
<label htmlFor="manufacturer">
Manufacturer
<span styleName="text-required">* Required</span>
</label>
<input id="manufacturer" name="manufacturer" type="text" placeholder="Manufacturer" value={newDevice.manufacturer} onChange={this.onUpdateInput} maxLength="64" required />
</div>
Expand All @@ -416,12 +418,14 @@ export default class Devices extends ConsentComponent {
<div styleName="field col-2">
<label htmlFor="model">
Model
<span styleName="text-required">* Required</span>
</label>
<input id="model" name="model" type="text" placeholder="Model" onChange={this.onUpdateInput} value={newDevice.model} maxLength="64" required />
</div>
<div styleName="field col-2">
<label htmlFor="operating-system">
Operating System
<span styleName="text-required">* Required</span>
</label>
<input id="operating-system" name="operatingSystem" type="text" onChange={this.onUpdateInput} placeholder="Operating System" value={newDevice.operatingSystem} maxLength="64" required />
</div>
Expand All @@ -430,12 +434,14 @@ export default class Devices extends ConsentComponent {
<div styleName="field col-2">
<label htmlFor="osVersion">
OS version
<span styleName="text-required">* Required</span>
</label>
<input id="os-version" name="osVersion" type="text" onChange={this.onUpdateInput} placeholder="OS version" value={newDevice.osVersion} maxLength="64" required />
</div>
<div styleName="field col-2">
<label htmlFor="osLanguage">
OS Language
<span styleName="text-required">* Required</span>
</label>
<input id="os-language" name="osLanguage" type="text" onChange={this.onUpdateInput} placeholder="OS Language" value={newDevice.osLanguage} maxLength="64" required />
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/shared/components/Settings/Tools/Devices/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
font-weight: 500;
color: $tc-gray-80;
margin-bottom: 5px;
display: flex;
justify-content: space-between;

.text-required {
color: $tc-red-110;
}
}

&.col-1 {
Expand Down
2 changes: 2 additions & 0 deletions src/shared/components/Settings/Tools/ServiceProviders/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ export default class ServiceProviders extends ConsentComponent {
<div styleName="field col-1">
<label htmlFor="serviceProviderType">
Type
<span styleName="text-required">* Required</span>
</label>
<Select
name="serviceProviderType"
Expand All @@ -336,6 +337,7 @@ export default class ServiceProviders extends ConsentComponent {
<div styleName="field col-2">
<label htmlFor="name">
Provider Name
<span styleName="text-required">* Required</span>
</label>
<input id="name" name="name" type="text" placeholder="Name" onChange={this.onUpdateInput} value={newServiceProvider.name} maxLength="64" required />
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/shared/components/Settings/Tools/ServiceProviders/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
font-weight: 500;
color: $tc-gray-80;
margin-bottom: 5px;
display: flex;
justify-content: space-between;

.text-required {
color: $tc-red-110;
}
}

&.col-1 {
Expand Down
2 changes: 2 additions & 0 deletions src/shared/components/Settings/Tools/Software/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ export default class Software extends ConsentComponent {
<div styleName="field col-1">
<label htmlFor="softwareType">
Software Type
<span styleName="text-required">* Required</span>
</label>
<Select
name="softwareType"
Expand All @@ -336,6 +337,7 @@ export default class Software extends ConsentComponent {
<div styleName="field col-2">
<label htmlFor="name">
Name
<span styleName="text-required">* Required</span>
</label>
<input id="name" name="name" type="text" placeholder="Name" onChange={this.onUpdateInput} value={newSoftware.name} maxLength="64" required />
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/shared/components/Settings/Tools/Software/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@
font-weight: 500;
color: $tc-gray-80;
margin-bottom: 5px;
display: flex;
justify-content: space-between;

.text-required {
color: $tc-red-110;
}
}

&.col-1 {
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/Settings/Tools/Subscriptions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ export default class Subscription extends ConsentComponent {
<div styleName="field col-1">
<label htmlFor="name">
Name
<span styleName="text-required">* Required</span>
</label>
<input id="name" name="name" type="text" placeholder="Name" onChange={this.onUpdateInput} value={newSubscription.name} maxLength="128" required />
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/shared/components/Settings/Tools/Subscriptions/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
font-weight: 500;
color: $tc-gray-80;
margin-bottom: 5px;
display: flex;
justify-content: space-between;

.text-required {
color: $tc-red-110;
}
}

&.col-1 {
Expand Down
12 changes: 6 additions & 6 deletions src/shared/components/Settings/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ $checkbox-bg-selected: $tc-dark-blue;
width: 100%;
box-shadow: 0 1px 0 0 #f0f0f0;

@include md-to-lg {
@include from-sm-to-lg {
padding: 30px;
}

@include xs-to-sm {
@include upto-sm {
padding: 10px;
}
}
Expand All @@ -64,7 +64,7 @@ $checkbox-bg-selected: $tc-dark-blue;
display: flex;
flex-direction: column;

@include xs-to-sm {
@include upto-sm {
display: none;
}

Expand All @@ -77,7 +77,7 @@ $checkbox-bg-selected: $tc-dark-blue;
justify-content: flex-start;

.field {
@include xs-to-sm {
@include upto-sm {
display: block;
padding-bottom: 10px;
}
Expand Down Expand Up @@ -329,15 +329,15 @@ $checkbox-bg-selected: $tc-dark-blue;
-moz-user-select: none;
-ms-user-select: none;

@include xs-to-sm {
@include upto-sm {
display: none;
}
}

.onoffswitch-mobile {
display: none;

@include xs-to-sm {
@include upto-sm {
@include switch-transition;

display: block;
Expand Down