Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Feature/tom settings styles #413

Merged
merged 4 commits into from
Oct 20, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Added some new input styles
  • Loading branch information
tladendo committed Oct 20, 2015
commit 2efc4980f8e45cf379b9c99f7d4228769176b714
14 changes: 7 additions & 7 deletions app/settings/account-info/account-info.jade
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.form-label.first First name
span(style="text-transform: none;")  (Given name)
.validation-bar(ng-class="{ 'error-bar': (vm.accountInfoForm.$dirty && vm.accountInfoForm.firstname.$invalid), 'success-bar': (vm.accountInfoForm.$dirty && vm.accountInfoForm.firstname.$valid)}")
input.form-field(
input.tc-input(
name="firstname", type="text",
placeholder="First",
ng-model="vm.userData.firstName",
Expand All @@ -72,7 +72,7 @@
.form-label Last name
span(style="text-transform: none;")  (Surname)
.validation-bar(ng-class="{ 'error-bar': (vm.accountInfoForm.$dirty && vm.accountInfoForm.lastname.$invalid), 'success-bar': (vm.accountInfoForm.$dirty && vm.accountInfoForm.lastname.$valid)}")
input.form-field(
input.tc-input(
name="lastname", type="text",
placeholder="Last",
ng-model="vm.userData.lastName",
Expand All @@ -90,7 +90,7 @@

.section-fields
.form-label.address Address
input.form-field(
input.tc-input(
name="address", type="text",
placeholder="123 Topcoder Ave.",
value="{{vm.homeAddress.streetAddr1}}",
Expand All @@ -104,7 +104,7 @@

.form-label Address 2
span(style="text-transform: none;")  (opt., suite, etc.)
input.form-field(
input.tc-input(
name="address2",
type="text",
placeholder="Suite 42",
Expand All @@ -114,7 +114,7 @@
)

.form-label City
input.form-field(
input.tc-input(
name="city", type="text",
value="{{vm.homeAddress.city}}",
placeholder="Best City in the World",
Expand All @@ -127,7 +127,7 @@
p(ng-show="vm.accountInfoForm.city.$error.required") Please enter a city

.form-label State/Province
input.form-field(
input.tc-input(
name="state", type="text",
value="{{vm.homeAddress.stateCode}}",
placeholder="California",
Expand All @@ -140,7 +140,7 @@
p(ng-show="vm.accountInfoForm.state.$error.required") Please enter a state or province

.form-label Zip
input.form-field(
input.tc-input(
name="zipcode", type="text",
placeholder="Zip"
value="{{vm.homeAddress.zip}}",
Expand Down
1 change: 1 addition & 0 deletions assets/css/partials/_combined.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import 'tc-colors';
@import 'tc-mixins';
@import 'tc-buttons';
@import 'tc-inputs';
32 changes: 32 additions & 0 deletions assets/css/partials/_tc-inputs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Topcoder Inputs
// tc- is the default prefix that we use for all classes

@import 'topcoder-includes';

input.tc-input {
color: #231f20;
outline: none;
background: white;
border: 1px solid #f0f0f0;
box-shadow: inset 0px 0px 2px 0px rgba(183,183,183,0.30);
border-radius: 2px;
cursor: auto;
color: #3d3d3d;
height: 30px;

&:hover {
border: 1px solid #A3A3AE;
box-shadow: inset 0px 0px 2px 0px #B7B7B7;
padding-left: 15px;
}

&:focus,
&.focus {
border: 1px solid #0096FF;
outline: none;
box-shadow: inset 0px 0px 2px 1px rgba(133,203,255,0.60);
padding-left: 15px;
}

transition: .15s all;
}
1 change: 0 additions & 1 deletion assets/css/partials/_tc-mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@
width: 300px;
padding: 0;
padding-left: 15px;
border: 0;
background-color: $gray-lightest;
@include source-sans-regular;
font-size: 16px;
Expand Down
4 changes: 0 additions & 4 deletions assets/css/settings/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@

.settings-container {
input, textarea {
border-radius: 5px;
font-size: 16px;
font-family: 'Source Sans Pro';
background: white;
color: black;
}
input:focus, textarea:focus {
outline: 1px solid #4cb5ff;
Expand Down Expand Up @@ -175,7 +172,6 @@
}
}
.form-field-focused {
@include form-field-focused;
}
.image {
.edit-image {
Expand Down