Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Adjust spacing of widget input-groups to better utilize limited space #280

Merged
merged 7 commits into from
Aug 23, 2016
Merged

Adjust spacing of widget input-groups to better utilize limited space #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
731fb83
Merge branch 'master' of https://github.com/UW-Madison-DoIT/uw-frame
thevoiceofzeke Aug 18, 2016
734bc66
Merge branch 'master' of https://github.com/UW-Madison-DoIT/uw-frame
thevoiceofzeke Aug 18, 2016
8f34937
Merge branch 'master' of https://github.com/UW-Madison-DoIT/uw-frame
thevoiceofzeke Aug 23, 2016
552fcc9
Adjust spacing of widget input-groups
thevoiceofzeke Aug 23, 2016
6f11ea6
Change md-menu items to sentence-case
thevoiceofzeke Aug 23, 2016
e491300
Hide crest image on sm/med screens to avoid overlapping search bar
thevoiceofzeke Aug 23, 2016
5e7ac79
Add left-margin to MyUW title on med screens
thevoiceofzeke Aug 23, 2016
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
5 changes: 5 additions & 0 deletions uw-frame-components/css/buckyless/header.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ portal-header {
padding-left: 0;
max-height: 56px;
.title-link {
h1 {
@media (min-width:600px) and (max-width: 960px) {
margin-left: 16px;
}
}
img {
height: 56px;
margin-right: 16px;
Expand Down
1 change: 0 additions & 1 deletion uw-frame-components/css/buckyless/md-generated.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ md-menu-content {
}
md-menu-item {
.md-button {
text-transform: capitalize;
font-weight: 400;
&:hover {
background-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion uw-frame-components/css/buckyless/responsive.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
}

.widget-body .input-group {
margin:10px 0px 30px;
margin: 20px 0;
}
.features-popup {
img {
Expand Down
2 changes: 1 addition & 1 deletion uw-frame-components/css/buckyless/widget.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
border:0 solid transparent;
}
.widget-body .input-group {
margin:10px auto 30px;
margin: 20px auto;
}
.widget-body .icon-button-div {
padding:0 0 10px 0;
Expand Down
2 changes: 1 addition & 1 deletion uw-frame-components/portal/features/partials/announcement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
ng-click="markAllAnnouncementsSeen(true)"
layout="row" layout-align="start center">
<span><i class='fa fa-star fa-fw'></i> </span>
<span>What's New ({{announcements.length}})</span>
<span>What's new ({{announcements.length}})</span>
</md-button>
</md-menu-item>
</div>
4 changes: 2 additions & 2 deletions uw-frame-components/portal/main/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Log out link -->
<md-menu-item>
<md-button class="md-default" ng-href="{{MISC_URLS.logoutURL}}" target="_self" ng-click="pushGAEvent('Sidebar', 'Click Link', 'Log out');">
<span class="fa fa-sign-out fa-fw"></span> Log Out
<span class="fa fa-sign-out fa-fw"></span> Log out
</md-button>
</md-menu-item>
</md-menu-content>
Expand All @@ -46,7 +46,7 @@
<img ng-src="{{portal.theme.crest}}"
class="crest"
alt="{{portal.theme.crestalt}}"
hide-xs>
hide-sm hide-xs>
<h1 class="md-title" layout="row">
<span>{{portal.theme.title}}</span>
<span class="beta-logo" ng-if="portal.theme.subtitle">{{portal.theme.subtitle}}</span>
Expand Down
4 changes: 2 additions & 2 deletions uw-frame-components/portal/main/partials/username.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
</md-button>
<md-menu-content width="3">
<md-menu-item ng-if="$storage.showSettings">
<md-button class="md-default" aria-label="change beta settings" tabindex="-1" ng-href="settings" title="Settings" ng-transclude>Beta Settings</md-button>
<md-button class="md-default" aria-label="change beta settings" tabindex="-1" ng-href="settings" title="Settings" ng-transclude>Beta settings</md-button>
</md-menu-item>
<md-menu-item ng-if="APP_FLAGS.showUserSettingsPage">
<md-button class="md-default" aria-label="change user settings" tabindex="-1" ng-href="user-settings" title="Settings" ng-transclude>Settings</md-button>
</md-menu-item>
<md-menu-item>
<md-button class="md-default" aria-label="log out" tabindex="-1" ng-href="{{MISC_URLS.logoutURL}}" title="Log Out" target="_self">Log Out</md-button>
<md-button class="md-default" aria-label="log out" tabindex="-1" ng-href="{{MISC_URLS.logoutURL}}" title="Log Out" target="_self">Log out</md-button>
</md-menu-item>
</md-menu-content>
</md-menu>