zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Removed btn class from btn-Action links because it's both redundant and bringing along messed up boostrap baggage with it #104

Browse source
This commit is contained in:
Victoria Wang 2015-03-24 13:36:12 -07:00
parent 55f74f3a01
commit 28fad8d3f2
11 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/_tags.erb
View file

@ -32,7 +32,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Add Tag</button> <button type="submit" class="btn-Action">Add Tag</button>
</div> </div>
</form> </form>
</div> </div>

8
views/admin.erb
View file

@ -22,7 +22,7 @@
<%== csrf_token_input_html %> <%== csrf_token_input_html %>
<p>Site Name:</p> <p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p> <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-Action" type="submit" value="Ban"></p> <p><input class="btn-Action" type="submit" value="Ban"></p>
</form> </form>
</div> </div>
<div class="col col-50"> <div class="col col-50">
@ -33,7 +33,7 @@
<p> <p>
<input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"> <input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off">
</p> </p>
<p><input class="btn btn-Action" type="submit" value="Mark NSFW"></p> <p><input class="btn-Action" type="submit" value="Mark NSFW"></p>
</form> </form>
</div> </div>
</div> </div>
@ -46,7 +46,7 @@
<p>All sites with this IP address will be removed.</p> <p>All sites with this IP address will be removed.</p>
<p>Site Name:</p> <p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p> <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-Action" type="submit" value="Ban"></p> <p><input class="btn-Action" type="submit" value="Ban"></p>
</form> </form>
</div> </div>
@ -58,7 +58,7 @@
<p>This site will be upgraded to the supporter plan.</p> <p>This site will be upgraded to the supporter plan.</p>
<p>Site Name:</p> <p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p> <p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-Action" type="submit" value="Upgrade to Supporter"></p> <p><input class="btn-Action" type="submit" value="Upgrade to Supporter"></p>
</form> </form>
</div> </div>
</div> </div>

4
views/dashboard.erb
View file

@ -181,7 +181,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true" type="button">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true" type="button">Cancel</button>
<button class="btn btn-Action btn-danger" type="button" onclick="fileDelete()"><i class="fa fa-trash" title="Delete"></i>Delete</button> <button class="btn-Action btn-danger" type="button" onclick="fileDelete()"><i class="fa fa-trash" title="Delete"></i>Delete</button>
</div> </div>
</div> </div>
@ -275,7 +275,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button type="button" class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Create</button> <button type="submit" class="btn-Action">Create</button>
</div> </div>
</form> </form>
</div> </div>

4
views/home.erb
View file

@ -107,8 +107,8 @@
<a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a> <a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a>
<div class="news-profile-button"> <div class="news-profile-button">
<a href="/site/<%= site.username %>" class="btn btn-Action"><i class="fa fa-user"></i> Profile</a> <a href="/site/<%= site.username %>" class="btn-Action"><i class="fa fa-user"></i> Profile</a>
<a href="#" id="shareButton" class="btn btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> Share</a> <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> Share</a>
</div> </div>
<%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %> <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>

2
views/plan/_pricing.erb
View file

@ -394,7 +394,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Upgrade</button> <button type="submit" class="btn-Action">Upgrade</button>
</div> </div>
</form> </form>
</div> </div>

2
views/settings/account.erb
View file

@ -63,7 +63,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Permanently Delete Site</button> <button type="submit" class="btn-Action">Permanently Delete Site</button>
</div> </div>
</form> </form>
</div> </div>

2
views/settings/site.erb
View file

@ -78,7 +78,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Permanently Delete Site</button> <button type="submit" class="btn-Action">Permanently Delete Site</button>
</div> </div>
</form> </form>
</div> </div>

4
views/site.erb
View file

@ -153,7 +153,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Report</button> <button type="submit" class="btn-Action">Report</button>
</div> </div>
</form> </form>
</div> </div>
@ -179,7 +179,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button> <button class="btn cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
<button type="submit" class="btn btn-Action">Block Site</button> <button type="submit" class="btn-Action">Block Site</button>
</div> </div>
</form> </form>
</div> </div>

4
views/site_files/text_editor.erb
View file

@ -69,8 +69,8 @@
</optgroup> </optgroup>
</select> </select>
</div> </div>
<a id="saveButton" class="btn btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a> <a id="saveButton" class="btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a>
<a class="btn btn-Action" href="//<%= current_site.host %>/<%= @filename %>" target="_blank">View</a> <a class="btn-Action" href="//<%= current_site.host %>/<%= @filename %>" target="_blank">View</a>
<a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'>Share</a> <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'>Share</a>
<!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> --> <!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> -->
<div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;"> <div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;">

4
views/welcome.erb
View file

@ -20,7 +20,7 @@ You can support our quest to bring back the creative, independent web by upgradi
</div> </div>
</div> </div>
<div class="row content txt-Center"> <div class="row content txt-Center">
<a href="/" class="btn btn-Action">Continue</a> <a href="/" class="btn-Action">Continue</a>
</div> </div>
</div> </div>
@ -91,7 +91,7 @@ You can support our quest to bring back the creative, independent web by upgradi
</div> </div>
<div class="row content txt-Center"> <div class="row content txt-Center">
<a href="/" class="btn btn-Action" onclick="$('#upgradeForm').submit(); return false"> <a href="/" class="btn-Action" onclick="$('#upgradeForm').submit(); return false">
Upgrade for $<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo Upgrade for $<%= Site::PLAN_FEATURES[:supporter][:price] %>/mo
</a> </a>
or pay with <a href="/plan/alternate/">PayPal</a> or <a href="/plan/alternate/">Bitcoin</a> or pay with <a href="/plan/alternate/">PayPal</a> or <a href="/plan/alternate/">Bitcoin</a>

4
views/welcome_mockup.erb
View file

@ -20,7 +20,7 @@ You can support our quest to bring back the creative, independent web by upgradi
</div> </div>
</div> </div>
<div class="row content txt-Center"> <div class="row content txt-Center">
<a href="/" class="btn btn-Action">Continue</a> <a href="/" class="btn-Action">Continue</a>
</div> </div>
</div> </div>
@ -60,7 +60,7 @@ You can support our quest to bring back the creative, independent web by upgradi
</div> </div>
<div class="row content txt-Center"> <div class="row content txt-Center">
<a href="/" class="btn btn-Action">Upgrade for <a href="/" class="btn-Action">Upgrade for
<% if parent_site && parent_site.legacy_supporter? %> <% if parent_site && parent_site.legacy_supporter? %>
$<%= Site::LEGACY_SUPPORTER_PRICES[parent_site[:plan_type].to_sym] %> $<%= Site::LEGACY_SUPPORTER_PRICES[parent_site[:plan_type].to_sym] %>
<% else %> <% else %>