Skip to content

Commit

Permalink
Merge pull request nextgis#506 from karavanjo/505
Browse files Browse the repository at this point in the history
nextgis#505 SocialButtons module was renamed to NgwShareButtons
  • Loading branch information
karavanjo authored Aug 15, 2016
2 parents 553301c + b2aacfa commit 29c92b3
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 22 deletions.
2 changes: 1 addition & 1 deletion nextgisweb/webmap/amd/ngw-webmap/Display.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ define([
"dijit/form/Select",
"dijit/form/DropDownButton",
"dijit/ToolbarSeparator",
"ngw-webmap/SocialButtons",
"ngw-webmap/NgwShareButtons",
// css
"xstyle/css!" + ngwConfig.amdUrl + "cbtree/themes/claro/claro.css",
"xstyle/css!" + ngwConfig.amdUrl + "openlayers/ol.css"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ define([
"dijit/layout/ContentPane",
"ngw-pyramid/i18n!webmap",
"ngw-pyramid/hbs-i18n",
"dojo/text!./template/SocialButtons.hbs",
"dojo/text!./template/NgwShareButtons.hbs",
"ngw/settings!webmap",
"ngw-webmap/Permalink",
"xstyle/css!./template/resources/SocialButtons/css/fontello.css",
"xstyle/css!./template/resources/SocialButtons/SocialButtons.css"
"xstyle/css!./template/resources/NgwShareButtons/css/fontello.css",
"xstyle/css!./template/resources/NgwShareButtons/NgwShareButtons.css"
], function (declare, array, lang, domStyle, on, query,
_TemplatedMixin, _WidgetsInTemplateMixin, ContentPane,
i18n, hbsI18n, template, settings, Permalink) {
Expand Down
2 changes: 1 addition & 1 deletion nextgisweb/webmap/amd/ngw-webmap/template/Display.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</div>

<div data-dojo-attach-point="socialButtons"
data-dojo-type="ngw-webmap/SocialButtons"
data-dojo-type="ngw-webmap/NgwShareButtons"
data-dojo-props="display: this"
title=""></div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="social-buttons">
<div class="ngw-share-buttons">
<i class="icon-share-squared"></i>
<div class="buttons">
<a class="icon-link permalink" href="javascript:void(0)"></a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div.social-buttons {
div.ngw-share-buttons {
position: absolute;
top: 30px;
right: 0;
Expand All @@ -8,50 +8,44 @@ div.social-buttons {

}

div.social-buttons i {
div.ngw-share-buttons i {

}

div.social-buttons i, div.social-buttons a {
div.ngw-share-buttons i, div.ngw-share-buttons a {
font-size: 24px;
color: #176FC1;
display: block;
text-decoration: none;
}

div.social-buttons a {
div.ngw-share-buttons a {
opacity: 0.8;
}

/*div.social-buttons {*/
/*background-color: pink;*/
/*padding: 30px;*/
/*width: 300px;*/
/*}*/

div.buttons {
display: none;
/*height: 75px;*/
overflow: auto;
/*width: 200px;*/
}

div.social-buttons:hover div.buttons {
div.ngw-share-buttons:hover div.buttons {
display: block;
}

div.social-buttons a.icon-facebook-squared {
div.ngw-share-buttons a.icon-facebook-squared {
color: #365899;
}
div.social-buttons a.icon-twitter-squared {
div.ngw-share-buttons a.icon-twitter-squared {
color: #1B95E0;
}
div.social-buttons a.icon-gplus-squared {
div.ngw-share-buttons a.icon-gplus-squared {
color: #D73D32;
}
div.social-buttons a.icon-vkontakte {
div.ngw-share-buttons a.icon-vkontakte {
color: #507299;
}
div.social-buttons a:hover {
div.ngw-share-buttons a:hover {
opacity: 1;
}

0 comments on commit 29c92b3

Please sign in to comment.