Skip to content

Commit

Permalink
Merge pull request #967 from aholachek/optimize-image
Browse files Browse the repository at this point in the history 
reducing background image size, replacing additional info with a shor…
  • Loading branch information
@aholachek
aholachek authored Jun 10, 2016
2 parents c582390 + fd011cb commit 87e1e8b
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 110 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"d3": "~3.4.6",
"d3-cloud": "~1.0.5",
"dsjslib": "https://github.com/monmohan/dsjslib.git#v0.6.6",
"fontawesome": "~4.3.0",
"fontawesome": "~4.6.0",
"html5-boilerplate": "~4.3.0",
"jQuery-QueryBuilder": "https://github.com/romanchyla/jQuery-QueryBuilder.git#master",
"jquery": "~2.0.3",
Expand Down
90 changes: 55 additions & 35 deletions src/js/widgets/search_bar/templates/search_bar_template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,45 +61,65 @@ <h2 class="sr-only">Search Bar to Enter New Query</h2>
<div class="col-sm-12">
<hr/>
</div>
<div class="col-sm-6 first">
<div class="quick-reference">
<div class="col-sm-6">

<dl class="dl-horizontal">
<dt>author</dt>
<dd>author:"huchra, john"</dd>
<dt>first author</dt>
<dd>author:"^huchra, john"</dd>
<dt>abstract + title</dt>
<dd>abs:"dark energy"</dd>
<dt>year</dt>
<dd>year:2000</dd>
<dt>year range</dt>
<dd>year:2000-2005</dd>
<dt>full text</dt>
<dd>full:"gravitational waves"</dd>
<dt>publication</dt>
<dd>bibstem:ApJ <i class="icon-help" data-toggle="tooltip" title="this field requires the bibstem, or journal abbreviation--try going to the 'Paper' tab above for an easy-to-use form version"></i></dd>
</dl>
<dl class="dl-horizontal">
<dt>author</dt>
<dd>author:"huchra, john"</dd>
<dt>first author</dt>
<dd>author:"^huchra, john"</dd>
<dt>abstract + title</dt>
<dd>abs:"dark energy"</dd>
<dt>year</dt>
<dd>year:2000</dd>
<dt>year range</dt>
<dd>year:2000-2005</dd>
<dt>full text</dt>
<dd>full:"gravitational waves"</dd>
<dt>publication</dt>
<dd>bibstem:ApJ <i class="icon-help" data-toggle="tooltip" title="this field requires the bibstem, or journal abbreviation--try going to the 'Paper' tab above for an easy-to-use form version"></i></dd>
</dl>
</div>
<div class="col-sm-6 quick-reference">
<dl class="dl-horizontal">
<dt>citations</dt>
<dd>citations(author:"huchra, j") <i class="icon-help" data-toggle="tooltip" title="finds all papers that cite a given set of papers"></i></dd>
<dt>references</dt>
<dd>references(author:"huchra, j") <i class="icon-help" data-toggle="tooltip" title="finds all papers referenced by a given set of papers"></i></dd>
<dt>reviews</dt>
<dd>reviews("gamma-ray bursts") <i class="icon-help" data-toggle="tooltip" title="finds articles citing the most relevant papers on the topic being researched"></i></dd>
<hr/>
<dt>refereed</dt>
<dd>property:refereed <i class="icon-help" data-toggle="tooltip" title="limit to non-refereed papers by searching property:notrefereed"></i></dd>
<dt>astronomy</dt>
<dd>database:astronomy <i class="icon-help" data-toggle="tooltip" title="limit to physics papers by searching database:physics"></i></dd>
</dl>
</div>
</div>
<div class="col-sm-6 second">
<dl class="dl-horizontal">
<dt>citations</dt>
<dd>citations(author:"huchra, j") <i class="icon-help" data-toggle="tooltip" title="finds all papers that cite a given set of papers"></i></dd>
<dt>references</dt>
<dd>references(author:"huchra, j") <i class="icon-help" data-toggle="tooltip" title="finds all papers referenced by a given set of papers"></i></dd>
<dt>reviews</dt>
<dd>reviews("gamma-ray bursts") <i class="icon-help" data-toggle="tooltip" title="finds articles citing the most relevant papers on the topic being researched"></i></dd>
<hr/>
<dt>refereed</dt>
<dd>property:refereed <i class="icon-help" data-toggle="tooltip" title="limit to non-refereed papers by searching property:notrefereed"></i></dd>
<dt>astronomy</dt>
<dd>database:astronomy <i class="icon-help" data-toggle="tooltip" title="limit to physics papers by searching database:physics"></i></dd>
</dl>

<div class="row ">
<div class="col-sm-12">
<hr style="margin:0 15px"/>
</div>
</div>

<div class="col-sm-12">
<hr/>
<a href="https://adsabs.github.io/help/search/search-syntax" target="_blank" class="pull-right"> <i class="fa fa-arrow-circle-o-right"></i> learn more about ADS search syntax </a>
</div>

<div class="landing-faq row">
<dl class="col-sm-12">
<dt> How can I learn more about searching the ADS? </dt>
<dd><a href="https://adsabs.github.io/help/search/search-syntax" target="_blank"> Check out our help page on search terms.</a></dd>

<dt> I want to use the old-style form instead of the new syntax!</dt>
<dd>We have a <a href="#classic-form">form similar to the ADS Classic form</a> to simplify your life.</dd>

<dt>How can I access ADS data programmatically?</dt>
<dd><a href="https://github.com/adsabs/adsabs-dev-api" target="_blank">Learn about our convenient ADS API here.</a></dd>
<dt>I still have questions!</dt>
<dd>If the <a href="https://adsabs.github.io/" target="_blank">help pages</a> don't answer them, contact us at
<a href="mailto:adshelp@cfa.harvard.edu"></a> adshelp@cfa.harvard.edu</dd>
</dl>
</div>

</div>

Expand Down
50 changes: 0 additions & 50 deletions src/js/wraps/landing_page_manager/landing-page-layout.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,56 +30,6 @@
</div>
</section>



<!-- choice buttons-->

<section class="s-bumblebee-info">
<div class="s-transparent-background">
<div class="features-wrapper">
<div class="col-sm-4">
<div>
<h2 class="s-center-text">What is Bumblebee?</h2>

<p>
This new beta interface, codename "Bumblebee", offers a new way to search ADS: rather than searching only titles and abstracts,
like "ADS Classic", Bumblebee allows you to search the full text of articles as well. For more information about how to create powerful searches <a
href="https://adsabs.github.io/help/search/search-syntax">click here</a>.
</p>
</div>

</div>
<div class="col-sm-4">
<div>
<h2 class="s-center-text">How can I collaborate?</h2>

<p>
All of Bumblebee's code is publically accessible at <a href="https://github.com/adsabs/bumblebee">Github.</a>
</p>
<p> You can programmatically access ADS Data by <a href="#/login"></a> making an account with ADS and signing up for an API key.
For more information about the API, <a href="https://github.com/adsabs/adsabs-dev-api">check out the API README</a>.
</p>
</div>

</div>
<div class="col-sm-4">
<div>
<h2 class="s-center-text">Where can I find...? </h2>
<p>
You can still access <a href="http://adsabs.harvard.edu/abstract_service.html">ADS Classic</a> and
<a href="http://labs.adsabs.harvard.edu/">ADS 2.0</a>.

To learn more about this new interface and all of
its functionality, visit the <a href="http://adsabs.github.io/help/">new ADS help pages</a>.
</p>
<p> Have a comment or want to report a bug? Please use the feedback form in the navigation bar. </p>
</div>
</div>
<div class="clearfix"></div>
</div>
</div>
</section>

</div>


Binary file modified src/styles/img/background.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 2 additions & 20 deletions src/styles/sass/ads-sass/landing-page.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $landing-page-hero-background : desaturate(lighten($brand-info, 20%), 15%);
}

.s-starry-background-wrapper {
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, .7)), url("../img/background.jpg");
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, .5)), url("../img/background.jpg");
margin: 0 -15px;
background-attachment: fixed;
}
Expand Down Expand Up @@ -109,23 +109,6 @@ $landing-page-hero-background : desaturate(lighten($brand-info, 20%), 15%);
font-size: 22px;
}

margin: 0 -15px;
background: url("../img/background.jpg") top center repeat fixed;
color: darken($text-color, 10%);

.s-transparent-background {
padding: 40px 0;
}

.features-wrapper {
background: white;
margin: 0 40px;
}

.features-wrapper .col-sm-4>div{
padding: 4%;
}

.s-bottom-line {
font-size: 1.5em;
padding-top: 10%;
Expand Down Expand Up @@ -242,7 +225,6 @@ div[data-field=date] {

.unobtrusive-landing-page-alert {
padding: 16px;
text-align: center;
border-bottom: 1px solid $gray-lighter;
text-align: center;
}

32 changes: 29 additions & 3 deletions src/styles/sass/ads-sass/search-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,17 @@ input.q {

.s-landing-page-layout {

.only-show-on-landing {
display: block;
}


.s-search-bar-widget {
max-width: 800px;
margin: auto;
}

.only-show-on-landing {
.quick-reference {
display: block;
font-size: 17px;
dl {
Expand All @@ -196,10 +200,10 @@ input.q {

@media screen and (min-width:$screen-sm-min){

.col-sm-6.first{
.col-sm-6:first-of-type{
width: 46%;
}
.col-sm-6.second {
.col-sm-6:nth-of-type(2) {
width: 54%;
}
dl {
Expand All @@ -218,3 +222,25 @@ input.q {
}

}

.landing-faq {
text-align: center;
font-size: 16px;
dl {
margin-left: 15px;
}
dt {
font-weight:500;
margin-top: 25px;
}
dd {
font-weight: 300;
a {
font-weight: normal;
}
}

}



6 changes: 5 additions & 1 deletion src/styles/sass/manifest.scss
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
$fa-font-path : '../../libs/fontawesome/';

$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 '../../libs/jqueryui/jquery-ui.min';
@import '../../libs/select2/select2';



//not using at the moment
//@import '../../libs/animate.css/animate';

Expand Down

0 comments on commit 87e1e8b

Please sign in to comment.