This commit is contained in:
Scott 2015-03-03 14:28:51 -05:00
Родитель d9be04d3fe
Коммит 682de44430
51 изменённых файлов: 143 добавлений и 200 удалений

Просмотреть файл

@ -9,7 +9,7 @@
"angular-sanitize": "1.2.14",
"cookie-js": "0.0.1",
"flag-icon-css": "0.6.4",
"font-awesome": "3.2.1",
"font-awesome": "4.1.0",
"intl-tel-input": "^5.1.7",
"jquery": "2.0.3",
"jquery-ui": "1.10.3",
@ -38,6 +38,7 @@
},
"resolutions": {
"angular": "1.2.14",
"selectize": "0.10.1"
"selectize": "0.10.1",
"font-awesome": "4.1.0"
}
}

Просмотреть файл

@ -1,35 +1,14 @@
// Variables
// -------------
@fa-chevron-right: "\f054";
@fa-chevron-left: "\f053";
@fa-random: "\f074";
@fa-hand-o-up: "\f0a6";
@fa-book: "\f02d";
@fa-suitcase: "\f0f2";
@fa-th: "\f00a";
@fa-file-text-o: "\f0f6";
@fa-check: "\f00c";
@fa-bug: "\f188";
@fa-group: "\f0c0";
@fa-comments: "\f086";
// Mixins
// ------
// I actually dk if these are included in fa 4 anymore but they're *incredibly*
// useful so we may want to move them back into mixins when we upgrade
.icon(@icon) {
.icon-FontAwesome();
content: @icon;
}
.icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
}
@fa-chevron-right: @fa-var-chevron-right;
@fa-chevron-left: @fa-var-chevron-left;
@fa-random: @fa-var-random;
@fa-hand-o-up: @fa-var-hand-o-up;
@fa-book: @fa-var-book;
@fa-suitcase: @fa-var-suitcase;
@fa-th: @fa-var-th;
@fa-file-text-o: @fa-var-file-text-o;
@fa-bug: @fa-var-bug;
@fa-group: @fa-var-group;
@fa-comments: @fa-var-comments;

Просмотреть файл

@ -99,7 +99,7 @@
}
.tag-container {
.icon-tags {
.fa-tags {
color: @gray-light;
}
font-size: 1.4rem;

Просмотреть файл

@ -20,6 +20,10 @@
}
}
.icon(@fa-icon) {
content: @fa-icon;
.fa();
}
// To be used as-is in markup, or for shortcuts as mixins!
.bg-weblit-Navigation {

Просмотреть файл

@ -8,6 +8,10 @@
@import "../../bower_components/selectize/dist/less/selectize";
@import "../../bower_components/selectize/dist/less/selectize.bootstrap3";
// Font Awesome
@import "../../bower_components/font-awesome/less/font-awesome";
@fa-font-path: "/bower_components/font-awesome/fonts";
/*********************************************************
* Sections
*/

Просмотреть файл

@ -210,7 +210,7 @@
color: @green;
position: absolute;
left: 0;
.icon(@fa-check);
.icon(@fa-var-check);
}
}

Просмотреть файл

@ -237,7 +237,7 @@
h2 {
margin-bottom: 1rem;
&::before {
.icon-FontAwesome;
.fa();
display: block;
}
}

Просмотреть файл

@ -35,7 +35,7 @@
margin-bottom: 0;
}
&:before {
.icon(@ok);
.icon(@fa-var-check);
color: @green;
position: absolute;
left: 0;

Просмотреть файл

@ -83,7 +83,7 @@
}
}
.icon-question-sign {
.fa-question-circle {
color: fade(@white, 60%);
cursor: pointer;
&:hover {
@ -168,7 +168,7 @@
}
.badge-tags {
line-height: 1.4;
.icon-tags {
.fa-tags {
color: @green;
}
}
@ -240,53 +240,6 @@
}
}
// Lists
.list-badges-requirements {
counter-reset: badges-number;
> li {
margin: (@grid-gutter-width * 2) 0;
}
// Major bullets
// Since this is parsed from markdown, include h1, h2, h3 just in case.
> li {
> h1, h2, h3 {
font-weight: normal;
font-size: 1.6em;
margin-bottom: @grid-gutter-width;
color: @green;
&:before {
counter-increment: badges-number;
content: counter(badges-number)'. ';
}
}
}
// Minor bullets with check marks
> li > ul {
background: #F5F5F5;
list-style: none;
padding: @grid-gutter-width;
border-top: 1px solid darken(#F5F5F5, 5%);
border-bottom: 1px solid darken(#F5F5F5, 5%);
> li {
padding-left: 2em;
margin-bottom: 1em;
position: relative;
&:last-of-type {
margin-bottom: 0;
}
&:before {
.icon(@ok);
color: @green;
position: absolute;
left: 0;
}
}
}
}
.claim-code-container {
width: 100%;
}

Просмотреть файл

@ -55,16 +55,16 @@
.fa {
box-shadow: none;
}
.icon-random {
.fa-random {
background-color: @yellow;
}
.icon-hand-up {
.fa-hand-o-up {
background-color: @blue;
}
.icon-map-marker {
.fa-map-marker {
background-color: @red;
}
.icon-book {
.fa-book {
background-color: @green;
}
}

Просмотреть файл

@ -99,7 +99,7 @@
.input-wrapper {
position: relative;
}
.icon-search {
.fa-search {
color: #CCC;
position: absolute;
right: 10px;

Просмотреть файл

@ -1,7 +1,7 @@
@import "mixins";
@import "../bower_components/font-awesome/less/font-awesome";
@import "../bower_components/persona-btn/persona-btn";
@FontAwesomePath: "/bower_components/font-awesome/font";
@fa-font-path: "/bower_components/font-awesome/fonts";
@personaBtnPath: "/bower_components/persona-btn";
/*********************************************************
@ -584,11 +584,11 @@ header {
font-family: "Open Sans Light";
}
i.footer-social.icon-google-plus {
i.footer-social.fa-google-plus {
font-size: 20px;
}
li i.icon-chevron-right {
li i.fa-chevron-right {
top: -0.1em;
font-size: 13px;
}

Просмотреть файл

@ -83,6 +83,11 @@
-o-transition: @transition;
}
.icon(@fa-icon) {
content: @fa-icon;
.fa();
}
// Flexbox
// http://css-tricks.com/using-flexbox/

Просмотреть файл

@ -2,10 +2,10 @@
* Search
*/
div.filter-list.ui-select-menu [class^="icon-"], [class*=" icon-"] {
div.filter-list.ui-select-menu .fa {
vertical-align: middle;
}
span.icon-caret-down {
span.fa-caret-down {
padding-right: 10px;
}
#search,
@ -161,6 +161,18 @@ span.icon-caret-down {
text-decoration: none;
border: none;
background: none;
.search-icon {
display: none;
}
&.icon-all .fa-th,
&.icon-tags .fa-tags,
&.icon-title .fa-th-list,
&.icon-user .fa-user,
&.icon-description .fa-align-left {
display: inline-block;
}
&:hover {
border-radius: 10px 10px 0 0;
color: @grey;
@ -170,7 +182,7 @@ span.icon-caret-down {
display: block;
}
}
.icon-caret-down {
.fa-caret-down {
font-size: 0.5em;
}
.filter-list {
@ -183,7 +195,7 @@ span.icon-caret-down {
padding: 0 1em;
line-height: 4;
span {
font-size: 1.5em;
font-size: 1.4em;
margin-right: 0.5em;
}
&:last-of-type {

Просмотреть файл

@ -8,7 +8,7 @@ body {
// Font awesome
@import "../bower_components/font-awesome/less/font-awesome";
@FontAwesomePath: "/bower_components/font-awesome/font";
@fa-font-path: "/bower_components/font-awesome/fonts";
// Makerstrap
@makerstrap-bower-path: "../bower_components";
@ -423,10 +423,10 @@ img {
margin-left: 5px;
color: @red;
cursor: pointer;
&.icon-heart-empty {
&.fa-heart-o {
color: @green;
}
&.details-page-icon.icon-heart-empty {
&.details-page-icon.fa-heart-o {
color: @blue;
}
&.make-like-details {
@ -536,7 +536,7 @@ img {
.tag-container {
.icon-tags {
.fa-tags {
color: #CCC;
}
font-size: 0.9em;

Просмотреть файл

@ -490,7 +490,7 @@ button.ui-blue-btn {
padding: 0 10px;
}
button i.icon-angle-right {
button i.fa-angle-right {
font-size: 26px;
vertical-align:middle;
padding-left: 5px;
@ -677,19 +677,3 @@ button i.icon-angle-right {
}
}
}
/*********************************************************
* Custom font awesome classes
*/
.icon-title:before {
content: "\f00b";
}
.icon-description:before {
content: "\f036";
}
.icon-all:before {
content: "\f00a";
}

Просмотреть файл

@ -2,7 +2,7 @@
{
"id": "index",
"title": "Explore",
"icon": "icon-random",
"icon": "fa-random",
"defaultUrl": "explore",
"pages": [
{
@ -14,14 +14,14 @@
{
"id": "tools",
"title": "Tools",
"icon": "icon-hand-up",
"icon": "fa-hand-o-up",
"defaultUrl": "tools",
"pages": []
},
{
"id": "events",
"title": "Events",
"icon": "icon-map-marker",
"icon": "fa-map-marker",
"defaultUrl": "{{EVENTS_URL}}",
"instantiate": true,
"pages": []
@ -29,7 +29,7 @@
{
"id": "teach",
"title": "Teach",
"icon": "icon-book",
"icon": "fa-book",
"defaultUrl": "mentor",
"pages": [
{

Двоичные данные
public/img/moi/EGF-logo.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 10 KiB

После

Ширина:  |  Высота:  |  Размер: 10 KiB

Двоичные данные
public/img/moi/GSMA-M4D-logo.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 6.2 KiB

После

Ширина:  |  Высота:  |  Размер: 6.2 KiB

Двоичные данные
public/img/moi/dnet-logo.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 8.6 KiB

После

Ширина:  |  Высота:  |  Размер: 8.6 KiB

Двоичные данные
public/img/moi/global-users.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 45 KiB

После

Ширина:  |  Высота:  |  Размер: 45 KiB

Двоичные данные
public/img/moi/moi-video-preview.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 410 KiB

Двоичные данные
public/img/moi/webmaker-wordmark.png

Двоичный файл не отображается.

До

Ширина:  |  Высота:  |  Размер: 11 KiB

После

Ширина:  |  Высота:  |  Размер: 11 KiB

Просмотреть файл

@ -87,7 +87,7 @@ define(['jquery', 'nunjucks', 'base/ui', 'moment', 'makeapi', 'localized', 'maso
makeID = $this.data("make-id"),
method;
if ($this.hasClass("icon-heart")) {
if ($this.hasClass("fa-heart")) {
method = "/unlike";
} else {
method = "/like";
@ -100,7 +100,7 @@ define(['jquery', 'nunjucks', 'base/ui', 'moment', 'makeapi', 'localized', 'maso
$count = $this.parent().parent().find(".like-count"),
$text = $this.parent().parent().find(".like-text");
$this.toggleClass("icon-heart icon-heart-empty");
$this.toggleClass("fa-heart fa-heart-o");
$count.html(newLen);
if (newLen === 0) {
$text.html(localized.get("Like-0"));
@ -114,7 +114,7 @@ define(['jquery', 'nunjucks', 'base/ui', 'moment', 'makeapi', 'localized', 'maso
auth.login();
} else {
// already like/unliked, update UI to reflect.
$this.toggleClass("icon-heart icon-heart-empty");
$this.toggleClass("fa-heart fa-heart-o");
}
});
}

Просмотреть файл

@ -28,10 +28,10 @@ define(['jquery', 'analytics'], function ($, analytics) {
analytics.event('Search all Clicked', {
label: searchInputVal
});
$searchTrigger.find('.icon-search')
.removeClass('icon-search')
.addClass('icon-spinner')
.addClass('icon-spin');
$searchTrigger.find('.fa-search')
.removeClass('fa-search')
.addClass('fa-spinner')
.addClass('fa-spin');
window.location = '/' + lang + '/search/?type=all&q=' + searchInputVal;
}

Просмотреть файл

@ -76,8 +76,8 @@ define(["jquery", "text!html/ui-fragments.html"], function ($, _fragments) {
$pagination.hide();
}
var $prevBtn = $_li.clone().html("<span class=\"icon-chevron-left\"></span>"),
$nextBtn = $_li.clone().html("<span class=\"icon-chevron-right\"></span>");
var $prevBtn = $_li.clone().html("<span class=\"fa fa-chevron-left\"></span>"),
$nextBtn = $_li.clone().html("<span class=\"fa fa-chevron-right\"></span>");
function pageSearch(page) {
return function () {

Просмотреть файл

@ -1,7 +1,7 @@
<!-- FRAGMENTS -->
<div class="ui-append ui-select">
<span class="ui-selected ui-smedium"></span>
<a class="icon icon-chevron-down"></a>
<a class="icon fa fa-chevron-down"></a>
<div class="ui-select-menu">
<ul>
<li data-value=""></li>

Просмотреть файл

@ -102,7 +102,7 @@ define(['jquery', 'social', 'localized'],
var makeID = $likeBtn.data("make-id"),
method;
if ($likeBtn.hasClass("icon-heart")) {
if ($likeBtn.hasClass("fa-heart")) {
method = "/unlike";
} else {
method = "/like";
@ -125,7 +125,7 @@ define(['jquery', 'social', 'localized'],
}
function updateLikes(newLen) {
$likeBtn.toggleClass("icon-heart icon-heart-empty");
$likeBtn.toggleClass("fa-heart fa-heart-o");
if (typeof newLen === "undefined") {
return;
} else if (newLen === 0) {
@ -156,7 +156,7 @@ define(['jquery', 'social', 'localized'],
var makeID = $reportButton.data("make-id"),
method;
if ($reportButton.hasClass("icon-flag")) {
if ($reportButton.hasClass("fa-flag")) {
method = "/cancelReport";
} else {
method = "/report";
@ -180,7 +180,7 @@ define(['jquery', 'social', 'localized'],
}
function updateReport(method) {
$reportButton.toggleClass("icon-flag icon-flag-alt");
$reportButton.toggleClass("fa-flag fa-flag-o");
$reportedText.toggleClass("hide");
if (method === "/report") {
displayTooltip($makeReportedMsg, 10000);

Просмотреть файл

@ -71,7 +71,7 @@ define(["jquery", "uri", "base/ui", "masonry", "base/login", "analytics", "local
makeID = $this.data("make-id"),
method;
if ($this.hasClass("icon-heart")) {
if ($this.hasClass("fa-heart")) {
method = "/unlike";
} else {
method = "/like";
@ -84,7 +84,7 @@ define(["jquery", "uri", "base/ui", "masonry", "base/login", "analytics", "local
$count = $this.parent().parent().find(".like-count"),
$text = $this.parent().parent().find(".like-text");
$this.toggleClass("icon-heart icon-heart-empty");
$this.toggleClass("fa-heart fa-heart-o");
$count.html(newLen);
if (newLen === 0) {
$text.html(localized.get("Like-0"));
@ -98,7 +98,7 @@ define(["jquery", "uri", "base/ui", "masonry", "base/login", "analytics", "local
webmakerAuth.login();
} else {
// already like/unliked, update UI to reflect.
$this.toggleClass("icon-heart icon-heart-empty");
$this.toggleClass("fa-heart fa-heart-o");
}
});
}
@ -136,7 +136,7 @@ define(["jquery", "uri", "base/ui", "masonry", "base/login", "analytics", "local
searchType = $this.attr("data-value");
$searchFilter.find("[name=type]").val(searchType);
$searchFilter.find("[data-selected] > span").attr("class", "icon-" + searchType);
$searchFilter.attr("class", "search-filter icon-" + searchType);
$searchFilter.find(".ui-on").removeClass("ui-on");
$this.addClass("ui-on");
if (!tagSuggestionEnabled && searchType === "tags") {

Просмотреть файл

@ -40,11 +40,11 @@
<input name="issue_comment" ng-show="showComment" ng-model="issueComment" class="form-control">
</p>
<button class="btn btn-success" ng-click="showComment = true" ng-hide="showComment">
<span class="icon icon-plus"></span> {{ 'Add a comment' | i18n }}
<span class="fa fa-plus"></span> {{ 'Add a comment' | i18n }}
</button>
<button class="btn btn-success pull-right" ng-click="issueBadges(issueEmails, issueComment)">
<span class="icon icon-plus"></span> {{ 'Issue new badge(s)' | i18n }}
<span class="fa fa-plus"></span> {{ 'Issue new badge(s)' | i18n }}
</button>
</div>
</form>

Просмотреть файл

@ -48,7 +48,7 @@
</div>
</div>
<div id="gallery-actions">
<a class="load-more" href="/{{lang}}/gallery/list/53fe24bc21d4817b6c000aad">{{ 'See more' | i18n }} <span class="icon-angle-down"></span></a>
<a class="load-more" href="/{{lang}}/gallery/list/53fe24bc21d4817b6c000aad">{{ 'See more' | i18n }} <span class="fa fa-angle-down"></span></a>
</div>
</section>
<section>

Просмотреть файл

@ -40,7 +40,7 @@
<a class="btn btn-primary btn-lg" href="https://support.mozilla.org/{{ lang }}/kb/translate-webmaker" target="_blank">
<span>
{{ 'StandardFooterButton' | i18n }}
<i class="icon-circle-arrow-right"></i>
<i class="fa fa-arrow-circle-right"></i>
</span>
</a>
</div>

Просмотреть файл

@ -20,7 +20,6 @@
<link rel="canonical" href="https://webmaker.org/{{ localeInfo.lang }}{{ currentPath }}" />
<meta property="description" content="{{ gettext("Strips away complexity") }}" />
<!-- /sharing -->
<link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.css">
<link rel="stylesheet" href="/css/style.{{ localeInfo.direction }}.css">
<meta name="csrf-token" content="{{ csrf }}">
@ -140,12 +139,12 @@
</ul>
<ul class="secondary">
<li><span class="fa icon-twitter"></span>
<li><span class="fa fa-twitter"></span>
<a href="https://twitter.com/webmaker">
@webmaker
</a>
</li>
<li><span class="fa icon-file-text-alt"></span>
<li><span class="fa fa-file-text-o"></span>
<a href="https://blog.webmaker.org">
{{ gettext("Blog") }}
</a>

Просмотреть файл

@ -10,7 +10,7 @@
<div class="col-sm-3">
<div id="badge" class="badge"><img src="{{ badge.imageUrl }}"></div>
<p class="badge-tags">
<span class="icon-tags"></span>
<span class="fa fa-tags"></span>
{% for tag in badge.tags %}
<a href="/{{localeInfo.lang}}/search?type=tags&q={{ tag.value }}" class="badge-tag">{{ tag.value }}</a>
{% endfor %}
@ -50,9 +50,9 @@
</div>
<div id="application" class="panel panel-navy panel-badges" data-badge-slug="{{ badge.slug }}" data-application-slug="{{ application.slug if application else null }}">
<div class="panel-body">
<button id="" class="js-close-panel close-panel btn"><span class="icon-remove"></span></button>
<button id="" class="js-close-panel close-panel btn"><span class="fa fa-times"></span></button>
<h2>{{ gettext("Claim this badge") }}
<span id="claim-code-explainer" class="icon-question-sign" title="For example, if you are awarded a badge for attending an event, the organizer of the event may provide you with a claim code."></span>
<span id="claim-code-explainer" class="fa fa-question-circle" title="For example, if you are awarded a badge for attending an event, the organizer of the event may provide you with a claim code."></span>
</h2>
<div class="submit-badge-error alert alert-danger hidden">
<p>{{ gettext("BadgesError") }} <span class="error-message"></span></p>
@ -86,7 +86,7 @@
<div id="application" class="panel panel-navy panel-badges" data-badge-slug="{{ badge.slug }}" data-application-slug="{{ application.slug if application else null }}">
<div class="panel-body">
<button id="" class="js-close-panel close-panel btn"><span class="icon-remove"></span></button>
<button id="" class="js-close-panel close-panel btn"><span class="fa fa-times"></span></button>
<h2>{{ gettext("Apply for this badge") }}</h2>
<div class="submit-badge-error alert alert-danger hidden">
<p>{{ gettext("BadgesError") }} <span class="error-message"></span></p>
@ -131,7 +131,7 @@
<div id="issue" class="panel panel-navy panel-badges" data-badge-slug="{{ badge.slug }}">
<div class="panel-body">
<button id="" class="js-close-panel close-panel btn"><span class="icon-remove"></span></button>
<button id="" class="js-close-panel close-panel btn"><span class="fa fa-times"></span></button>
<h2>Issue this badge</h2>
<div class="submit-badge-error alert alert-danger hidden">
<p>{{ gettext("BadgesError") }} <span class="error-message"></span></p>

Просмотреть файл

@ -4,7 +4,6 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="csrf-token" content="{{ csrf }}">
<link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.css">
<link media="screen" rel="stylesheet" href="/css/style.css">
<link media="screen" rel="stylesheet" href="/css/make-details.css">
</head>
@ -58,7 +57,7 @@
<span data-make-id="{{ id }}"
title="Report Inappropriate Make"
id="make-report-toggle"
class="{{ 'icon-flag' if userReported else 'icon-flag-alt' }}">
class="fa {{ 'fa-flag' if userReported else 'fa-flag-o' }}">
<span id="report-not-logged-in" class="tooltip hide">{{ gettext("Log in to report") }}</span>
<span id="make-reported-message" class="tooltip hide">{{ gettext("Make successfully reported") | safe }}</span>
<span id="make-report-error" class="tooltip hide">{{ gettext("Reporting error") | safe }}</span>
@ -68,8 +67,8 @@
<span class="social-media">
{% set tweetText = gettext("TweetText") %}
<a href="https://plus.google.com/share?url={{url}}" id="share-gplus" target="_blank" class="btn"><span class="icon-google-plus icon"></span> {{ gettext("Share") }}</a>
<a id="share-twitter" href="https://twitter.com/intent/tweet?text={{tweetText }}{{url}}&hashtags=Webmaker&related=webmaker&url={{url}}" target="_blank" class="share btn"><span class="icon-twitter icon"></span> {{ gettext("Share") }}</a>
<a href="https://plus.google.com/share?url={{url}}" id="share-gplus" target="_blank" class="btn"><span class="fa fa-google-plus icon"></span> {{ gettext("Share") }}</a>
<a id="share-twitter" href="https://twitter.com/intent/tweet?text={{tweetText }}{{url}}&hashtags=Webmaker&related=webmaker&url={{url}}" target="_blank" class="share btn"><span class="fa fa-twitter"></span> {{ gettext("Share") }}</a>
<span id="share-container" class="hidden">
<a target="_blank" id="google-btn"></a>
<a target="_blank" id="twitter-btn"></a>
@ -84,7 +83,7 @@
<span class="icon-{{tool}}"></span>
<a target="_blank" href="{{remixurl}}" class="tool-name">{{ tool }}</a>
<span data-make-id="{{ id }}"
class="make-like-toggle details-page-icon make-like-details {{ 'icon-heart' if hasBeenLiked else 'icon-heart-empty' }}" >
class="fa make-like-toggle details-page-icon make-like-details {{ 'fa-heart' if hasBeenLiked else 'fa-heart-o' }}" >
<span id="like-not-logged-in" class="tooltip hide">{{ gettext("Log in to like") }}</span>
</span>
<span class="like-count">{{ likes.length }} </span>

Просмотреть файл

@ -17,7 +17,7 @@
<div class="sidebar-search">
<span class="input-wrapper">
<input id="admin-search-input" type="text" value="{{username}}">
<span class="icon-search"></span>
<span class="fa fa-search"></span>
</span>
</div>
<div class="search-filter">

Просмотреть файл

@ -7,7 +7,7 @@
{% if layout=='index' %}
<div id="banner-join" class="gallery-hide stamp" style="display: none;" >
<div class="rotator">
<h2 style="display: block;">{{ gettext("The web is still open.") }}<br> {{ gettext("Hack it.") }}</h2></div><div class="join-border"></div><div class="join-signin"><span class="join-claim">{{ gettext("Claim your Webmaker domain.") }}</span><span class="btn-join-container"><a class="ui-blue-btn btn-signin">{{ gettext("Sign in") }}<i class="icon-angle-right"></i></a></span>
<h2 style="display: block;">{{ gettext("The web is still open.") }}<br> {{ gettext("Hack it.") }}</h2></div><div class="join-border"></div><div class="join-signin"><span class="join-claim">{{ gettext("Claim your Webmaker domain.") }}</span><span class="btn-join-container"><a class="ui-blue-btn btn-signin">{{ gettext("Sign in") }}<i class="fa fa-angle-right"></i></a></span>
</div>
</div>
{% endif %}
@ -15,7 +15,7 @@
<div id="banner-teach" class="gallery-hide g-4 stamp">
<img src="/img/webmaker-community.jpg" alt="{{ gettext("Webmaker Community") }}"><div class="joinBorder"></div>
<p>{{ gettext("teachBanner") | instantiate | safe }}<br><a href='/{{localeInfo.lang}}/mentor'>
<button class='ui-blue-btn'>{{ gettext("Explore our mentoring program") }} <i class='icon-angle-right'></i></button></a>
<button class='ui-blue-btn'>{{ gettext("Explore our mentoring program") }} <i class='fa fa-angle-right'></i></button></a>
</p>
</div>
{% endif %}

Просмотреть файл

@ -36,7 +36,6 @@
}
</style>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700|Lato:900|Fira+Sans:700">
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css">
<!-- Note: this file is rendered with Less middleware can be found at /less/explore/main.less -->
<link rel="stylesheet" ng-href="/css/angular/main.{{direction}}.css">
</head>

Просмотреть файл

@ -125,7 +125,7 @@
<div id="footer-actions">
{% if layout %}
<a class="load-more">{{ gettext("Load more") }}
<span class="icon-angle-down"></span></a>
<span class="fa fa-angle-down"></span></a>
{% endif %}
</div>
{% endblock %}
@ -152,12 +152,12 @@
</ul>
<ul class="secondary">
<li><span class="fa icon-twitter"></span>
<li><span class="fa fa-twitter"></span>
<a href="https://twitter.com/webmaker">
@webmaker
</a>
</li>
<li><span class="fa icon-file-text-alt"></span>
<li><span class="fa fa-file-text-o"></span>
<a href="https://blog.webmaker.org">
{{ gettext('Blog') }}
</a>

Просмотреть файл

@ -12,7 +12,7 @@
<ul>
<li>
<a id="composing"></a>
<span class="hover-anchor"><a href="#composing"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingComposing') }}</span></span>
<span class="hover-anchor"><a href="#composing"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingComposing') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingComposingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingComposingPoint1')}}</span></li>
@ -24,7 +24,7 @@
</li>
<li>
<a id="remixing"></a>
<span class="hover-anchor"><a href="#remixing"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingRemixing') }}</span></span>
<span class="hover-anchor"><a href="#remixing"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingRemixing') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingRemixingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingRemixingPoint1')}}</span></li>
@ -34,7 +34,7 @@
</li>
<li>
<a id="design"></a>
<span class="hover-anchor"><a href="#design"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingDesign') }}</span></span>
<span class="hover-anchor"><a href="#design"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingDesign') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingDesignDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingDesignPoint1')}}</span></li>
@ -47,7 +47,7 @@
</li>
<li>
<a id="coding"></a>
<span class="hover-anchor"><a href="#coding"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingCoding') }}</span></span>
<span class="hover-anchor"><a href="#coding"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingCoding') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingCodingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingCodingPoint1')}}</span></li>
@ -59,7 +59,7 @@
</li>
<li>
<a id="infrastructure"></a>
<span class="hover-anchor"><a href="#infrastructure"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingInfra') }}</span></span>
<span class="hover-anchor"><a href="#infrastructure"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardBuildingInfra') }}</span></span>
<span class="comp-desc">{{ gettext('StandardBuildingInfraDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardBuildingInfraPoint1')}}</span></li>

Просмотреть файл

@ -12,7 +12,7 @@
<ul>
<li>
<a id="sharing"></a>
<span class="hover-anchor"><a href="#sharing"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingSharing') }}</span></span>
<span class="hover-anchor"><a href="#sharing"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingSharing') }}</span></span>
<span class="comp-desc">{{ gettext('StandardConnectingSharingDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardConnectingSharingPoint1')}}</span></li>
@ -22,7 +22,7 @@
</li>
<li>
<a id="community"></a>
<span class="hover-anchor"><a href="#community"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingCommunity') }}</span></span>
<span class="hover-anchor"><a href="#community"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingCommunity') }}</span></span>
<span class="comp-desc">{{ gettext('StandardConnectingCommunityDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardConnectingCommunityPoint1')}}</span></li>
@ -35,7 +35,7 @@
</li>
<li>
<a id="privacy"></a>
<span class="hover-anchor"><a href="#privacy"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingPrivacy') }}</span></span>
<span class="hover-anchor"><a href="#privacy"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingPrivacy') }}</span></span>
<span class="comp-desc">{{ gettext('StandardConnectingPrivacyDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardConnectingPrivacyPoint1')}}</span></li>
@ -47,7 +47,7 @@
</li>
<li>
<a id="open"></a>
<span class="hover-anchor"><a href="#open"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingOpen') }}</span></span>
<span class="hover-anchor"><a href="#open"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardConnectingOpen') }}</span></span>
<span class="comp-desc">{{ gettext('StandardConnectingOpenDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardConnectingOpenPoint1')}}</span></li>

Просмотреть файл

@ -12,7 +12,7 @@
<ul>
<li>
<a id="navigation"></a>
<span class="hover-anchor"><a href="#navigation"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardExploringNav') }}</span></span>
<span class="hover-anchor"><a href="#navigation"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardExploringNav') }}</span></span>
<span class="comp-desc">{{ gettext('StandardExploringNavDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardExploringNavPoint1')}}</span></li>
@ -24,7 +24,7 @@
</li>
<li>
<a id="web-mechanics"></a>
<span class="hover-anchor"><a href="#web-mechanics"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardExploringWM') }}</span></span>
<span class="hover-anchor"><a href="#web-mechanics"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardExploringWM') }}</span></span>
<span class="comp-desc">{{ gettext('StandardExploringWMDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardExploringWMPoint1')}}</span></li>
@ -34,7 +34,7 @@
</li>
<li>
<a id="search"></a>
<span class="hover-anchor"><a href="#search"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardExploringSearch') }}</span></span>
<span class="hover-anchor"><a href="#search"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardExploringSearch') }}</span></span>
<span class="comp-desc">{{ gettext('StandardExploringSearchDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardExploringSearchPoint1')}}</span></li>
@ -45,7 +45,7 @@
</li>
<li>
<a id="credibility"></a>
<span class="hover-anchor"><a href="#credibility"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardExploringCredibility') }}</span></span>
<span class="hover-anchor"><a href="#credibility"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardExploringCredibility') }}</span></span>
<span class="comp-desc">{{ gettext('StandardExploringCredibilityDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardExploringCredibilityPoint1')}}</span></li>
@ -56,7 +56,7 @@
</li>
<li>
<a id="security"></a>
<span class="hover-anchor"><a href="#security"><i class="icon-link icon-large"></i></a><span class="comp-title">{{ gettext('StandardExploringSecurity') }}</span></span>
<span class="hover-anchor"><a href="#security"><i class="fa fa-link fa-large"></i></a><span class="comp-title">{{ gettext('StandardExploringSecurity') }}</span></span>
<span class="comp-desc">{{ gettext('StandardExploringSecurityDesc') }}</span>
<ul>
<li><span>{{ gettext('StandardExploringSecurityPoint1')}}</span></li>

Просмотреть файл

@ -462,7 +462,7 @@
<div id="footer-actions">
{% if layout %}
<a class="load-more">{{ gettext("Load more") }}
<span class="icon-angle-down"></span></a>
<span class="fa fa-angle-down"></span></a>
{% endif %}
</div>
{% endblock %}

Просмотреть файл

@ -11,7 +11,7 @@
<input type="search" placeholder="{{gettext('Search gallery')}}" name="q" results="5"/>
<input type="hidden" name="type" value="all"/>
<button type="submit" aria-label="Search">
<span class="icon-search"></span>
<span class="fa fa-search"></span>
</button>
</form>
</div>

Просмотреть файл

@ -1,7 +1,7 @@
{% macro makeTags() %}
{% if make.rawTags.length %}
<div class="tag-container">
<span class="icon-tags" title="tags"></span>
<span class="fa fa-tags" title="tags"></span>
{% for tag in make.prettyTags %}
{%- if loop.index <= 10 %}
<a class="tag" href="/t/{{tag}}">{{tag}}</a>
@ -24,8 +24,8 @@
{% macro likeIcon() %}
{% if make.hasBeenLiked %}
<span data-make-id="{{ make.id }}" class="make-like-toggle icon-heart"></span>
<span data-make-id="{{ make.id }}" class="make-like-toggle fa fa-heart"></span>
{% else %}
<span data-make-id="{{ make.id }}" class="make-like-toggle icon-heart-empty"></span>
<span data-make-id="{{ make.id }}" class="make-like-toggle fa fa-heart-o"></span>
{% endif %}
{% endmacro %}

Просмотреть файл

@ -14,8 +14,8 @@
<p class="title">{{make.title}}</p>
</div>
<div class="btn-container">
{% if make.editurl %}<a href="{{make.editurl}}" target="_blank" class="ui-btn view-btn"><span class="icon icon-pencil"></span></a>{% endif %}
<button type="submit" data-make-id="{{make._id}}" class="ui-btn delete-btn"><span class="icon icon-trash"></span></button>
{% if make.editurl %}<a href="{{make.editurl}}" target="_blank" class="ui-btn view-btn"><span class="fa fa-pencil"></span></a>{% endif %}
<button type="submit" data-make-id="{{make._id}}" class="ui-btn delete-btn"><span class="fa fa-trash-o"></span></button>
</div>
</a>
</div>

Просмотреть файл

@ -14,7 +14,7 @@
</div>
<div class="btn-container">
{% if make.type != "x-ray-goggles" %}
<a href="{{make.remixurl}}" class="ui-btn fork-btn fork-btn-label"><span class="icon-code-fork"></span> {{ gettext("Remix") }}</a>
<a href="{{make.remixurl}}" class="ui-btn fork-btn fork-btn-label"><span class="fa fa-code-fork"></span> {{ gettext("Remix") }}</a>
{% endif %}
</div>
</a>

Просмотреть файл

@ -13,7 +13,7 @@
</div>
{{ makeTags() }}
<div class="btn-container">
<a class="ui-btn fork-btn fork-btn-label" href="{{make.remixurl}}"><span class="icon-code-fork"></span> {{ "Remix" | gettext }}</a>
<a class="ui-btn fork-btn fork-btn-label" href="{{make.remixurl}}"><span class="fa fa-code-fork"></span> {{ "Remix" | gettext }}</a>
{{ likeIcon() }}
</div>
</div>

Просмотреть файл

@ -18,7 +18,7 @@
{{ makeTags() }}
</div>
<div class="btn-container">
<a class="ui-btn fork-btn fork-btn-label" href="{{make.remixurl}}"><span class="icon-code-fork"></span> {{ "Remix" | gettext }}</a>
<a class="ui-btn fork-btn fork-btn-label" href="{{make.remixurl}}"><span class="fa fa-code-fork"></span> {{ "Remix" | gettext }}</a>
<a class="ui-btn details-btn fork-btn-label" href="{{make.url}}">{{ "Details" | gettext }}</a>
{{ likeIcon() }}
</div>

Просмотреть файл

@ -7,22 +7,26 @@
<div class="giant-search-container">
<h1 class="main-title">{{ gettext("What are you looking for?") }}</h1>
<form class="search-wrapper" method="get">
<div id="search-type" class="search-filter">
<div id="search-type" class="search-filter icon-{{ searchIcon }}">
<input type="hidden" name="type" value="{{ searchIcon }}">
<span data-selected><span class="icon-{{ searchIcon }}"></span></span>
<span class="icon-caret-down"></span>
<span data-selected><span class="search-icon fa fa-th"></span></span>
<span data-selected><span class="search-icon fa fa-th-list"></span></span>
<span data-selected><span class="search-icon fa fa-align-left"></span></span>
<span data-selected><span class="search-icon fa fa-tags"></span></span>
<span data-selected><span class="search-icon fa fa-user"></span></span>
<span class="fa fa-caret-down"></span>
<div class="filter-list ui-select-menu">
<ul>
<li data-value="all"><span class="icon-all"></span> {{ gettext("All") }}</li>
<li data-value="title"><span class="icon-title"></span> {{ gettext("Title") }}</li>
<li data-value="description"><span class="icon-description"></span> {{ gettext("Description") }}</li>
<li data-value="tags"><span class="icon-tags"></span> {{ gettext("Tags") }}</li>
<li data-value="user"><span class="icon-user"></span> {{ gettext("Users") }}</li>
<li data-value="all"><span class="fa fa-th"></span> {{ gettext("All") }}</li>
<li data-value="title"><span class="fa fa-th-list"></span> {{ gettext("Title") }}</li>
<li data-value="description"><span class="fa fa-align-left"></span> {{ gettext("Description") }}</li>
<li data-value="tags"><span class="fa fa-tags"></span> {{ gettext("Tags") }}</li>
<li data-value="user"><span class="fa fa-user"></span> {{ gettext("Users") }}</li>
</ul>
</div>
</div>
<input id="search-field" type="search" name="q" class="giant-search" autocomplete="off">
<button type="submit" class="search-btn"><span class="icon-search"></span></button>
<button type="submit" class="search-btn"><span class="fa fa-search"></span></button>
</form>
</div>
</div>

Просмотреть файл

@ -7,7 +7,7 @@
{% set header = gettext("teachHeader") %}
{% set des = gettext("teachDesc") %}
{% set desc = des + "<a href='/{{localeInfo.lang}}/literacy'><br><button class='ui-blue-btn'><i class='icon-file'></i>{{ gettext('TeachWebLitButton') }}</button></a> <a href='https://sendto.mozilla.org/page/s/mentor-signup'><button class='ui-blue-btn'>{{ gettext('Sign up') }}</button></a>" %}
{% set desc = des + "<a href='/{{localeInfo.lang}}/literacy'><br><button class='ui-blue-btn'><i class='fa fa-file'></i>{{ gettext('TeachWebLitButton') }}</button></a> <a href='https://sendto.mozilla.org/page/s/mentor-signup'><button class='ui-blue-btn'>{{ gettext('Sign up') }}</button></a>" %}
{{ galleryHeader(header, desc) }}
{% endblock %}