diff --git a/src/js/wraps/landing_page_manager/landing_page_manager.js b/src/js/wraps/landing_page_manager/landing_page_manager.js
index 51bdf88e3..d9fee23e8 100644
--- a/src/js/wraps/landing_page_manager/landing_page_manager.js
+++ b/src/js/wraps/landing_page_manager/landing_page_manager.js
@@ -63,6 +63,10 @@ define([
}
},
+ onWidgetSelected(child, ev, attrs) {
+ PageManagerController.prototype.onWidgetSelected.apply(this, arguments);
+ },
+
/**
* Override the setActive method to inject the default navItem, if we have one
* @param {string} navItem the navitem name
diff --git a/src/js/wraps/user_settings_page_manager/user-settings-layout.html b/src/js/wraps/user_settings_page_manager/user-settings-layout.html
index 1fe336929..09f05d124 100644
--- a/src/js/wraps/user_settings_page_manager/user-settings-layout.html
+++ b/src/js/wraps/user_settings_page_manager/user-settings-layout.html
@@ -12,11 +12,12 @@
diff --git a/src/js/wraps/user_settings_page_manager/user_nav.html b/src/js/wraps/user_settings_page_manager/user_nav.html
index 9aa824d8d..a8f680467 100644
--- a/src/js/wraps/user_settings_page_manager/user_nav.html
+++ b/src/js/wraps/user_settings_page_manager/user_nav.html
@@ -1,56 +1,53 @@
+
+
-
-
-
- {{#each preferences}}
-
-
-
- {{this.title}}
-
-
-
- {{/each}}
-
-
-
- Coming soon
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{#each settings}}
-
-
-
-
- {{this.title}} {{#if this.showCount}}
-
- {{#if this.numFound}}({{this.numFound}}){{/if}}
- {{/if}}
-
-
-
-
- {{/each}}
+
+
+ {{#each preferences}}
+
+
+
+ {{this.title}}
+
+
+
+ {{/each}}
+
+
+
+ {{#each notifications}}
+
+
+
+
+ {{this.title}}
+ {{#if this.showCount}}
+ {{#if this.numFound}}({{this.numFound}}){{/if}}
+ {{/if}}
+
+
+
+
+ {{/each}}
+
+
+
+ {{#each settings}}
+
+
+
+
+ {{this.title}}
+ {{#if this.showCount}}
+ {{#if this.numFound}}({{this.numFound}}){{/if}}
+ {{/if}}
+
+
+
+
+ {{/each}}
diff --git a/src/js/wraps/user_settings_page_manager/user_page_manager.js b/src/js/wraps/user_settings_page_manager/user_page_manager.js
index 70dbed6ab..ea4e9c661 100644
--- a/src/js/wraps/user_settings_page_manager/user_page_manager.js
+++ b/src/js/wraps/user_settings_page_manager/user_page_manager.js
@@ -69,6 +69,11 @@ define([
path: 'user/settings/delete',
category: 'settings',
},
+ MyAdsDashboard: {
+ title: 'myADS',
+ path: 'user/settings/myads',
+ category: 'notifications',
+ },
},
});
return PageManager;
diff --git a/src/shared b/src/shared
new file mode 160000
index 000000000..444ee8c90
--- /dev/null
+++ b/src/shared
@@ -0,0 +1 @@
+Subproject commit 444ee8c90168499802f87840a9782e053c666286
diff --git a/src/styles/img/how_to_add_general_query.gif b/src/styles/img/how_to_add_general_query.gif
new file mode 100644
index 000000000..2e1192855
Binary files /dev/null and b/src/styles/img/how_to_add_general_query.gif differ
diff --git a/src/styles/img/myADS.gif b/src/styles/img/myADS.gif
new file mode 100644
index 000000000..ffeeae804
Binary files /dev/null and b/src/styles/img/myADS.gif differ
diff --git a/src/styles/sass/ads-sass/general-components.scss b/src/styles/sass/ads-sass/general-components.scss
index 49c48150e..9b7d3451d 100644
--- a/src/styles/sass/ads-sass/general-components.scss
+++ b/src/styles/sass/ads-sass/general-components.scss
@@ -1,25 +1,24 @@
-
-#app-container{
- height: 100%;
- position: relative;
+#app-container {
will-change: transform;
}
-#body-template-container{
- height: 100%
+#body-template-container {
+ height: 100%;
}
-.s-master-page-manager{
+.s-master-page-manager {
height: 100%;
}
-
.s-title-format {
margin-bottom: 10px;
padding: 1px 2%;
background-color: lighten($gray-lighter, 4%);
- h1, h2, h3, h4 {
+ h1,
+ h2,
+ h3,
+ h4 {
margin: 6px 0;
font-size: 28px;
font-weight: 300;
@@ -27,7 +26,7 @@
}
.s-edit-indicator {
- border-bottom: 1px dashed $brand-primary-faded;
+ border-bottom: 1px dashed $brand-primary-faded;
&:before {
@extend .fa;
@@ -44,21 +43,21 @@
.btn-primary.btn-inverse {
color: $brand-primary;
- box-shadow:none;
+ box-shadow: none;
&:hover {
- box-shadow:none;
+ box-shadow: none;
background-color: mix($brand-primary, #fff, 15%);
}
}
.btn-primary-faded.btn-inverse {
color: $brand-primary-faded;
background-color: #fff;
- box-shadow:none;
+ box-shadow: none;
&:hover {
- box-shadow:none;
+ box-shadow: none;
background-color: mix($brand-primary-faded, #fff, 15%);
}
- box-shadow : none;
+ box-shadow: none;
}
.btn-info.btn-inverse {
color: $brand-info;
@@ -68,42 +67,42 @@
box-shadow: none;
background-color: mix($brand-info, #fff, 15%);
}
- box-shadow : none;
+ box-shadow: none;
}
.btn-success.btn-inverse {
color: $brand-success;
background-color: #fff;
- box-shadow : none;
+ box-shadow: none;
&:hover {
- box-shadow : none;
+ box-shadow: none;
background-color: mix($brand-success, #fff, 15%);
- }
- box-shadow : none;
+ }
+ box-shadow: none;
}
.btn-warning.btn-inverse {
color: $brand-warning;
background-color: #fff;
- box-shadow:none;
+ box-shadow: none;
&:hover {
- box-shadow:none;
+ box-shadow: none;
background-color: mix($brand-warning, #fff, 15%);
}
- box-shadow : none;
+ box-shadow: none;
}
.btn-danger.btn-inverse {
color: $brand-danger;
background-color: #fff;
- box-shadow:none;
+ box-shadow: none;
&:hover {
- box-shadow:none;
+ box-shadow: none;
background-color: mix($brand-danger, #fff, 15%);
}
- box-shadow : none;
+ box-shadow: none;
}
.s-tab {
- display:inline-block;
+ display: inline-block;
text-align: center;
min-width: 150px;
font-size: 18px;
@@ -119,15 +118,15 @@
a {
width: 180px;
display: inline-block;
- color : $text-color;
+ color: $text-color;
&:hover {
text-decoration: none;
}
- &:focus{
+ &:focus {
text-decoration: none;
}
}
- transition : all, .5s;
+ transition: all, 0.5s;
.dropdown-menu {
li {
@@ -141,28 +140,27 @@
}
}
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
//no idea why this is necessary
background-color: transparent;
}
-
.s-tab .dropdown-menu li {
color: $text-color;
}
-
-.s-tab.active{
+.s-tab.active {
border-bottom: 4px solid $brand-primary-faded;
- color: $brand-primary-faded;
+ color: $brand-primary-faded;
a {
- color: $brand-primary-faded;
+ color: $brand-primary-faded;
}
}
.s-tab.s-disabled {
color: $gray-light;
- &:hover{
+ &:hover {
border-bottom: 4px solid $body-bg;
}
cursor: default;
diff --git a/src/styles/sass/ads-sass/landing-page.scss b/src/styles/sass/ads-sass/landing-page.scss
index 48aa7eec6..67bafc760 100644
--- a/src/styles/sass/ads-sass/landing-page.scss
+++ b/src/styles/sass/ads-sass/landing-page.scss
@@ -1,8 +1,6 @@
$landing-page-hero-background: desaturate(lighten($brand-info, 20%), 15%);
.s-landing-page-layout {
- margin-left: -15px;
- margin-right: -15px;
padding-left: 15px;
padding-right: 15px;
}
@@ -38,7 +36,6 @@ $landing-page-hero-background: desaturate(lighten($brand-info, 20%), 15%);
justify-content: center;
background-attachment: fixed;
- @extend .row;
padding-top: 20px;
text-align: center;
}
diff --git a/src/styles/sass/ads-sass/miscellaneous.scss b/src/styles/sass/ads-sass/miscellaneous.scss
index 599a97cca..bd66cf4e6 100644
--- a/src/styles/sass/ads-sass/miscellaneous.scss
+++ b/src/styles/sass/ads-sass/miscellaneous.scss
@@ -1,16 +1,13 @@
-
//tests
#mocha-stats > li.progress {
height: 40px;
}
-
// the hidden live region
-#aria-announcement-container{
-
- color : fade(#fff, 0%);
+#aria-announcement-container {
+ color: fade(#fff, 0%);
position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
@@ -19,3 +16,20 @@
.grecaptcha-badge {
display: none;
}
+
+// make label group like
+.label-group {
+ .label:first-child {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+
+ .label:last-child {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+ }
+
+ .label:not(:first-child):not(:last-child) {
+ border-radius: 0;
+ }
+}
diff --git a/src/styles/sass/ads-sass/page-managers.scss b/src/styles/sass/ads-sass/page-managers.scss
index ea551c9fa..31ceb2f86 100644
--- a/src/styles/sass/ads-sass/page-managers.scss
+++ b/src/styles/sass/ads-sass/page-managers.scss
@@ -8,7 +8,7 @@ s-search-bar-motion is applied */
@mixin container-fixed($gutter: $grid-gutter-width) {
margin-right: auto;
margin-left: auto;
- padding-left: floor(($gutter / 2));
+ padding-left: floor(($gutter / 2));
padding-right: ceil(($gutter / 2));
@include clearfix;
}
@@ -22,7 +22,7 @@ s-search-bar-motion is applied */
color: $gray-light;
font-weight: 300;
width: 100%;
- @media only screen and (min-width : 768px) {
+ @media only screen and (min-width: 768px) {
font-size: 2rem;
min-height: 50vh;
width: auto;
@@ -39,7 +39,7 @@ s-search-bar-motion is applied */
.logo__data-system {
color: lighten($gray-light, 12%);
}
- @media only screen and (min-width : 768px) {
+ @media only screen and (min-width: 768px) {
font-size: 5rem;
}
}
@@ -52,7 +52,7 @@ s-search-bar-motion is applied */
font-size: 1rem;
margin-top: 20px;
text-align: center;
- @media only screen and (min-width : 768px) {
+ @media only screen and (min-width: 768px) {
font-size: 1.5rem;
}
}
@@ -61,34 +61,32 @@ s-search-bar-motion is applied */
.loading-screen__loading {
position: relative;
top: -40px;
- font-size: .5em;
+ font-size: 0.5em;
}
-.hidden-col{
- width: 0 ;
- padding: 0 ;
- margin: 0 ;
+.hidden-col {
+ width: 0;
+ padding: 0;
+ margin: 0;
opacity: 0;
}
.btn-expand {
-
- display:none;
+ display: none;
.descriptor {
display: none;
}
//show in desktops
- @media (min-width : $screen-sm-min){
+ @media (min-width: $screen-sm-min) {
display: inline-block;
- transition : all .5s ease-out;
+ transition: all 0.5s ease-out;
&:hover {
- box-shadow : 1px 1px 5px darken($gray-light, 4%);
+ box-shadow: 1px 1px 5px darken($gray-light, 4%);
}
}
-
}
.left-expand {
@@ -102,7 +100,6 @@ s-search-bar-motion is applied */
&:before {
content: $fa-var-angle-double-left;
}
-
}
.right-expand {
@@ -124,32 +121,28 @@ s-search-bar-motion is applied */
/* Styles for results and abstract page */
-
.s-main-content-container {
-
@extend .clearfix;
@extend .s-ads-card;
min-height: 600px;
padding-bottom: 20px;
position: relative;
margin: 0 auto 40px auto;
-
}
//this class is useful if you want to apply a background to
//div[data-widget] when the widget doesnt always need the background
.s-inner-div-background {
- margin: 30px 0;
- >div {
+ margin: 30px 0;
+ > div {
@extend .s-main-content-container;
margin: 0;
}
-
}
.s-dynamic-page-body {
- background-color: $darker-background;
+ background-color: $darker-background;
min-height: 500px;
}
@@ -169,9 +162,7 @@ s-search-bar-motion is applied */
/* Styles just for results page */
-
.s-results-page-layout {
-
.s-left-col-container {
@extend .s-ads-card;
padding: 5px;
@@ -180,14 +171,15 @@ s-search-bar-motion is applied */
margin-bottom: 25px;
@extend .unselectable;
}
+ @extend .container-fluid;
}
.s-right-column {
- padding-right: 0;
+ padding-right: 0;
}
.btn-upside-down i {
- transform : rotate(-180deg);
+ transform: rotate(-180deg);
}
#body-template-container {
@@ -199,34 +191,29 @@ s-search-bar-motion is applied */
top: 1.25%;
right: 2%;
background-color: white;
-
}
.right-col-close {
-
@extend .fa;
@extend .fa-lg;
- &:before{
- content : $fa-var-chevron-circle-left;
+ &:before {
+ content: $fa-var-chevron-circle-left;
}
-
}
.right-col-open {
@extend .fa;
@extend .fa-lg;
- &:before{
- content : $fa-var-chevron-circle-right;
+ &:before {
+ content: $fa-var-chevron-circle-right;
}
}
-
.navbar h1 {
- color : $gray-light;
+ color: $gray-light;
margin: 0;
padding: 0;
font-size: 25px;
-
}
/*
@@ -249,7 +236,6 @@ Styles for Abstract Page
li {
margin: 0 0 1% 6%;
}
-
}
.s-right-col-widget-title {
margin-top: 2px;
@@ -260,26 +246,22 @@ Styles for Abstract Page
color: $gray-lighter;
}
-#app-container {
- overflow-x: hidden;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
+#main-content:focus {
+ outline: none;
}
-#main-content:focus { outline: none; }
.s-results-middle-column {
- @media (min-width : $screen-sm-min){
+ @media (min-width: $screen-sm-min) {
float: right;
}
- @media (min-width : $screen-md-min){
+ @media (min-width: $screen-md-min) {
float: left;
}
}
.s-right-column {
-
- @media (min-width : $screen-md-min){
+ @media (min-width: $screen-md-min) {
padding-left: 0;
padding-right: 15px;
}
diff --git a/src/styles/sass/ads-sass/print.scss b/src/styles/sass/ads-sass/print.scss
index 76de0b4e4..bb7854043 100644
--- a/src/styles/sass/ads-sass/print.scss
+++ b/src/styles/sass/ads-sass/print.scss
@@ -1,9 +1,10 @@
.print-visible {
- display : none;
+ display: none;
}
@media print {
-
- *, *:before, *:after {
+ *,
+ *:before,
+ *:after {
overflow: visible !important;
}
@@ -13,7 +14,7 @@
}
.print-visible {
- display:block;
+ display: block;
}
.s-results-links {
@@ -31,21 +32,27 @@
}
//general, any page adjustments
- .s-results-control-row-container, #navbar-container, .s-stable-search-bar-height, .s-metrics-metadata, .footer {
- display:none !important;
+ .s-results-control-row-container,
+ #navbar-container,
+ .s-stable-search-bar-height,
+ .s-metrics-metadata,
+ .footer {
+ display: none !important;
}
- .nav-container, .toggle-menu {
+ .nav-container,
+ .toggle-menu {
display: none !important;
}
- .s-right-col-widget-container, .query-info-widget {
- display : none;
+ .s-right-col-widget-container,
+ .query-info-widget {
+ display: none;
}
-.main-content-container {
- border: none;
-}
+ .main-content-container {
+ border: none;
+ }
//abstract-page
li.author a {
@@ -55,11 +62,11 @@
//metrics
.icon-help {
- display:none;
+ display: none;
}
.close-widget {
- display:none;
+ display: none;
}
.s-metrics-title {
@@ -74,11 +81,12 @@
}
.nv-controlsWrap {
- display : none;
+ display: none;
}
- .s-metrics-table, .s-metrics-graph {
- display:block !important;
+ .s-metrics-table,
+ .s-metrics-graph {
+ display: block !important;
margin: 0 auto;
width: 100%;
}
@@ -87,6 +95,4 @@
width: 60%;
margin-bottom: 50px;
}
-
-
}
diff --git a/src/styles/sass/ads-sass/results-page-widgets.scss b/src/styles/sass/ads-sass/results-page-widgets.scss
index 49fd9c941..50eebc38d 100644
--- a/src/styles/sass/ads-sass/results-page-widgets.scss
+++ b/src/styles/sass/ads-sass/results-page-widgets.scss
@@ -80,35 +80,28 @@
font-size: 18px;
}
.s-library-area {
- margin-top: 15px;
- margin-bottom: 20px;
border: 0 solid transparent;
background-color: white;
@extend .s-ads-card;
}
- #library-console,
- .s-library-add-title {
+ #library-console {
padding: 10px;
}
- .s-library-add-title {
- background: $brand-info;
- transition: background 0.4s;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
- color: white;
- font-weight: 300;
- font-size: 16px;
- cursor: pointer;
- i.fa-caret-down {
- position: relative;
- top: 4px;
- left: -8px;
- float: right;
- font-size: 1.5em;
- }
- &:hover {
- background: darken($brand-info, 5%);
+
+ .library-add-title {
+ &:hover,
+ &:focus {
+ background: darken(white, 5%) !important;
}
+ text-decoration: none;
+ }
+
+ .s-library-add-title__title {
+ display: flex;
+ justify-content: space-between;
+ color: #5d5d5d;
+ font-size: 1.25em;
}
.s-filter-div {
font-weight: 300;
@@ -141,3 +134,9 @@
.s-empty-view-msg {
padding: 0 10% 0 10%;
}
+
+.results-right-column {
+ div[data-widget] {
+ margin-bottom: 1em;
+ }
+}
diff --git a/src/styles/sass/manifest.scss b/src/styles/sass/manifest.scss
index 47ce769d1..a954ded9d 100644
--- a/src/styles/sass/manifest.scss
+++ b/src/styles/sass/manifest.scss
@@ -1,5 +1,4 @@
-
-$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.6.3/fonts"; // for referencing Bootstrap CDN font files directly
+$fa-font-path: '//netdna.bootstrapcdn.com/font-awesome/4.6.3/fonts'; // for referencing Bootstrap CDN font files directly
@import '../../libs/fontawesome/scss/font-awesome';
@import '../../styles/smoothness/jquery-ui.min';
+