Consolidate button styles
This patchset will create consistent button styling according
to the styleguide and remove redundant button styles by creating
reusable button classes.
This patchset also implements a consistent strategy for including
icon assets. Currently, svg icons are imported as CSS background
images or inlined into the markup. Inlining an svg is preferred,
especially when used with buttons or links so the colors can
be easily changed for different states (hover, focus, disabled)
without having to request variants.
The icon provider allows us to inline svgs without cluttering
the markup. Webpack config was adjusted to use svg-inline-loader
when resolving svgs that are used by the icon provider directive.
- All svgs were optimized to remove unncessary information.
- Removed unused svg color variants
- Moved icons used by icon provider to separate directory to
avoid Webpack parsing the files twice
- Small changes to navigation icons
Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I1ca214b74fc502e6b6e760cfee88b48110237c43
diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index 343d4fd..f434ef6 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -72,12 +72,12 @@
<input id="ipv4-prefix-{{$index+1}}" class="column small-6" ng-change="ipv4.updatePrefix = true"
type="number" min="1" max="32" step="1" ng-disabled="interface.DHCPEnabled"
ng-model="ipv4.PrefixLength" />
- <button class="network-config_remove-button inline" ng-click="removeIpv4Address($index)">Remove</button>
+ <button class="btn btn-tertiary network-config_remove-button" ng-click="removeIpv4Address($index)">Remove</button>
</div>
</fieldset>
<div class="row column">
<div class="column small-12">
- <button type="button" class="btn-primary inline" ng-click="addIpv4Field()">Add IPV4 address</button>
+ <button type="button" class="btn btn-primary" ng-click="addIpv4Field()">Add IPV4 address</button>
</div>
</div>
</div>
@@ -94,19 +94,23 @@
<label for="net-config__prime-dns{{$index+1}}">DNS Server {{$index+1}}</label>
<input id="net-config__prime-dns{{$index+1}}" class="network-input column small-6 large-4 inline"
type="text" ng-model="dns" ng-blur="interface.Nameservers[$index] = dns" set-focus-on-new-input />
- <button class="network-config_remove-button inline" ng-click="removeDNSField($index)">Remove</button>
+ <button class="btn btn-tertiary network-config_remove-button" ng-click="removeDNSField($index)">Remove</button>
</div>
</div>
<div class="row column">
<div class="column small-12">
- <button type="button" class="btn-primary inline dns_add" ng-click="addDNSField()">Add DNS server</button>
+ <button type="button" class="btn btn-primary dns_add" ng-click="addDNSField()">Add DNS server</button>
</div>
</div>
</div>
</fieldset>
- <div class="network-config__submit-wrapper">
- <button type="button" class="btn-primary inline" ng-click="confirmSettings=true;">Save settings</button>
- <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
+ <div class="row column">
+ <div class="network-config__submit-wrapper column">
+ <div class="float-right">
+ <button type="button" class="btn btn-secondary" ng-click="refresh()">Cancel</button>
+ <button type="button" class="btn btn-primary" ng-click="confirmSettings=true;">Save settings</button>
+ </div>
+ </div>
</div>
</form>
</div>
@@ -125,8 +129,8 @@
Proceed with caution and make note of any new settings that may affect connectivity.</p>
</div>
<div class="modal__button-wrapper">
- <button class="inline btn-secondary" ng-click="confirmSettings=false;">Cancel</button>
- <button class="inline btn-primary" ng-click="setNetworkSettings()">Continue</button>
+ <button class="btn btn-secondary" ng-click="confirmSettings=false;">Cancel</button>
+ <button class="btn btn-primary" ng-click="setNetworkSettings()">Continue</button>
</div>
</div>
</section>
\ No newline at end of file