Skip to content

Fauxton: do not underline help icons on hover #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertkowalski wants to merge 1 commit into from
Closed

Fauxton: do not underline help icons on hover #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/fauxton/app/addons/documents/templates/design_doc_selector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
the License.
-->
<div class="span3">
<label for="ddoc">Save to Design Document <a href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<label for="ddoc">Save to Design Document <a class="help-link" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="ddoc">
<optgroup label="Select a document">
<option value="new-doc">New document</option>
Expand All @@ -30,6 +30,6 @@
<div id="new-ddoc-section" class="span5" style="display:none">
<label class="control-label" for="new-ddoc"> _design/ </label>
<div class="controls">
<input type="text" id="new-ddoc" placeholder="newDesignDoc">
<input type="text" id="new-ddoc" placeholder="newDesignDoc" />
</div>
</div>
14 changes: 7 additions & 7 deletions src/fauxton/app/addons/documents/templates/view_editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
</div>

<div class="control-group">
<label for="index-name">Index name <a href="<%=getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<input type="text" id="index-name" value="<%= viewName %>" placeholder="Index name" />
<label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" />
</div>


<div class="control-group">
<label for="map-function">Map function <a href="<%=getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<label for="map-function">Map function <a class="help-link" href="<%-getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<% if (newView) { %>
<div class="js-editor" id="map-function"><%= langTemplates.map %></div>
<% } else { %>
Expand All @@ -51,12 +51,12 @@


<div class="control-group">
<label for="reduce-function-selector">Reduce (optional) <a href="<%=getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<label for="reduce-function-selector">Reduce (optional) <a class="help-link" href="<%-getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>

<select id="reduce-function-selector">
<option value="" <%= !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
<option value="" <%- !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
<% _.each(["_sum", "_count", "_stats"], function(reduce) { %>
<option value="<%= reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
<option value="<%- reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
<% }) %>
<option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom Reduce function</option>
</select>
Expand All @@ -65,7 +65,7 @@
<div class="control-group reduce-function">
<label for="reduce-function">Custom Reduce function</label>
<% if (newView) { %>
<div class="js-editor" id="reduce-function"><%= langTemplates.reduce %></div>
<div class="js-editor" id="reduce-function"><%- langTemplates.reduce %></div>
<% } else { %>
<div class="js-editor" id="reduce-function"><%- ddoc.get('views')[viewName].reduce %></div>
<button class="beautify beautify_reduce btn btn-primary btn-large hide beautify-tooltip" type="button" data-toggle="tooltip" title="Reformat your minified code to make edits to it.">beautify this code</button>
Expand Down
4 changes: 2 additions & 2 deletions src/fauxton/app/addons/fauxton/templates/api_bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
-->

<button class="btn btn-primary pull-right api-url-btn">
API URL
API URL
<i class="fonticon-plus icon"></i>
</button>
<div class="api-navbar" style="display: none">
<div class="input-prepend input-append">
<span class="add-on">
API reference
<a href="<%-getDocUrl(documentation)%>" target="_blank">
<a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
<i class="icon-question-sign"></i>
</a>
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/fauxton/app/addons/permissions/templates/item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
the License.
-->

<span> <%= item %> </span>
<span> <%- item %> </span>
<button type="button" class="pull-right close">&times;</button>

16 changes: 8 additions & 8 deletions src/fauxton/app/addons/permissions/templates/section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@
the License.
-->
<header class="page-header">
<h3> <%= (section) %> </h3>
<p class="help"> <%= help %> <a href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
<h3> <%- section %> </h3>
<p class="help"> <%- help %> <a class="help-link" href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
</header>

<div class="row-fluid">
<div class="span6">
<header>
<h4> Users </h4>
<p>Specify users who will have <%= section %> access to this database.</p>
<p>Specify users who will have <%- section %> access to this database.</p>
</header>
<form class="permission-item-form form-inline">
<input data-section="<%= section %>" data-type="names" type="text" class="item input-small" placeholder="Add Name">
<input data-section="<%- section %>" data-type="names" type="text" class="item input-small" placeholder="Add Name">
<button type="submit" class="btn btn-success"><i class="icon fonticon-circle-plus"></i> Add Name</button>
</form>
<ul class="clearfix unstyled permission-items span10" id="<%= (section) %>-items-names">
<ul class="clearfix unstyled permission-items span10" id="<%- section %>-items-names">
</ul>
</div>
<div class="span6">
<header>
<h4> Roles </h4>
<p>All users under the following role(s) will have <%= section %> access.</p>
<p>All users under the following role(s) will have <%- section %> access.</p>
</header>


<form class="permission-item-form form-inline">
<input data-section="<%= section %>" data-type="roles" type="text" class="item input-small" placeholder="Add Role">
<input data-section="<%- section %>" data-type="roles" type="text" class="item input-small" placeholder="Add Role">
<button type="submit" class="btn btn-success"><i class="icon fonticon-circle-plus"></i> Add Role</button>
</form>
<ul class="unstyled permission-items span10" id="<%= (section) %>-items-roles">
<ul class="unstyled permission-items span10" id="<%- (section) %>-items-roles">
</ul>
</div>
</div>
4 changes: 2 additions & 2 deletions src/fauxton/app/addons/replication/templates/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="from_local local_option">
<select id="from_name" name="source">
<% _.each( databases, function( db, i ){ %>
<option value="<%=db.name%>" <% if(selectedDB == db.name){%>selected<%}%> ><%=db.name%></option>
<option value="<%- db.name %>" <% if(selectedDB == db.name){%>selected<%}%> ><%- db.name %></option>
<% }); %>
</select>
</div>
Expand Down Expand Up @@ -63,7 +63,7 @@

<label for="createTarget">
<input type="checkbox" name="create_target" value="true" id="createTarget">
Create Target <a href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
Create Target <a class="help-link" href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
</label>
</div>

Expand Down
4 changes: 4 additions & 0 deletions src/fauxton/assets/less/fauxton.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ label {
font-size: 12px;
}

a.help-link:hover {
text-decoration: none;
}

input[type=text].error {
border: red 1px solid;
}
Expand Down