Skip to content

upgrade bootstrap and move to package.json #1381

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

Merged
mockdeep merged 1 commit into from
Feb 14, 2026
Merged

upgrade bootstrap and move to package.json #1381

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
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//= require jquery.min.js
//= require bootstrap-min.js
//= require bootstrap.min.js
//= require bootstrap.file-input.js
//= require mousetrap.js
//= require jquery.visible.min.js
Expand Down
22 changes: 12 additions & 10 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
*= require bootstrap.min
*= require_tree .
*/

Expand Down Expand Up @@ -56,11 +57,11 @@ code {
}

@media (max-width: 768px) {
#footer .row-fluid > * {
#footer .row > * {
display: none;
}

#footer .row-fluid > .span6:first-child {
#footer .row > .col-md-8:first-child {
display: block;
width: 100%;
text-align: center;
Expand All @@ -82,8 +83,9 @@ code {

#action-bar .btn {
padding: 8px;
height: 18px;
width: 18px;
height: 34px;
width: 34px;
line-height: 18px;
}

#action-bar button.btn {
Expand Down Expand Up @@ -419,7 +421,7 @@ li.feed .feed-last-updated {
display: none;
}

li.feed .row-fluid .span2 {
li.feed .row .col-md-2 {
float: right;
margin-right: 21px;
}
Expand Down Expand Up @@ -510,8 +512,8 @@ li.feed .remove-feed a:hover {
text-align: center;
}

.setup .control-group input {
width: 210px;
.setup .form-group input {
width: 350px;
}

.setup .field-icon {
Expand All @@ -527,11 +529,11 @@ li.feed .remove-feed a:hover {
transition: 0.25s;
}

.setup .control-group input:focus + .field-icon {
.setup .form-group input:focus + .field-icon {
color: #484948;
}

.setup .control-group input:focus ~ .field-label {
.setup .form-group input:focus ~ .field-label {
color: #484948;
}

Expand Down Expand Up @@ -560,7 +562,7 @@ li.feed .remove-feed a:hover {
width: 244px;
}

.setup .control-group {
.setup .form-group {
position: relative;
}

Expand Down
9 changes: 0 additions & 9 deletions app/assets/stylesheets/bootstrap-min.css
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/feeds/_single_feed_action_bar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row-fluid">
<div class="row">
<div class="pull-left">
<a class="btn" id="home" href="/news" title="<%= t('partials.feed_action_bar.home') %>">
<i class="icon-reply"></i>
Expand Down
6 changes: 3 additions & 3 deletions app/views/feeds/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
<hr />
<%= form_with(url: "/feeds/#{@feed.id}", method: :put, id: "add-feed-setup") do %>
<input type="hidden" name="feed_id" value="<%= @feed.id %>">
<div class="control-group">
<div class="form-group">
<input name="feed_name" id="feed-name" class="form-control" type="text" value="<%= @feed.name %>" required />
<i class="icon-pencil field-icon"></i>
<label id="feed-name-label" class="field-label" for="feed-name"><%= t('feeds.edit.fields.feed_name') %></label>
</div>
<div class="control-group">
<div class="form-group">
<input name="feed_url" id="feed-url" class="form-control" type="text" value="<%= @feed.url %>" autofocus required />
<i class="icon-rss field-icon"></i>
<label id="feed-url-label" class="field-label" for="feed-url"><%= t('feeds.edit.fields.feed_url') %></label>
</div>
<% if current_user.groups.any? %>
<div class="control-group">
<div class="form-group">
<input type="text" class="form-control" tabindex="-1">
<select name="group_id" id="group-id">
<option value=""></option>
Expand Down
2 changes: 1 addition & 1 deletion app/views/feeds/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<p><%= t('feeds.add.description') %></p>
<hr />
<%= form_with(url: "/feeds", id: "add-feed-setup") do %>
<div class="control-group">
<div class="form-group">
<input name="feed_url" class="form-control" id="feed-url" type="text" value="<%= @feed_url %>" autofocus/>
<i class="icon-rss field-icon"></i>
<label id="feed_url-label" class="field-label" for="feed_url"><%= t('feeds.add.fields.feed_url') %></label>
Expand Down
10 changes: 5 additions & 5 deletions app/views/js/templates/_story.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script type="text/template" id="story-template">
<div class="row-fluid story-preview">
<div class="span3">
<div class="row story-preview">
<div class="col-md-3">
<div class="story-starred">
<i class="icon-star{{ if(!is_starred) { }}-empty{{ } }}"></i>
</div>
<p class="blog-title">
{{= source }}
</p>
</div>
<div class="span9">
<div class="col-md-9">
<p class="story-details">
<span class="story-title">
{{= headline }}
Expand All @@ -20,7 +20,7 @@
</div>
</div>

<div class="story-body-container" class="row-fluid">
<div class="story-body-container">
<div class="story-body">
<h1>
<a href="{{= permalink }}">{{= title }}</a>
Expand All @@ -32,7 +32,7 @@
</h1>
{{= body }}
</div>
<div class="row-fluid story-actions-container">
<div class="row story-actions-container">
<div class="pull-left">
<span class="story-published">
{{= pretty_date }}
Expand Down
6 changes: 3 additions & 3 deletions app/views/layouts/_flash.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<% end %>

<% if flash.key? :error %>
<div class="alert alert-error error">
<div class="alert alert-danger error">
<%= flash[:error] %>
</div>
<% end %>

<noscript>
<div class="alert alert-error error">
<div class="alert alert-danger error">
<%= t('flash.js_required') %>
</div>
</noscript>

<div id="cookies-required" class="alert alert-error error" style="display: none;">
<div id="cookies-required" class="alert alert-danger error" style="display: none;">
<%= t('flash.cookies_required') %>
</div>

Expand Down
18 changes: 9 additions & 9 deletions app/views/layouts/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<div class="container">
<div class="row-fluid">
<div class="span8">
<div class="row">
<div class="col-md-8">
<ul class="footer-links">
<% if current_user %>
<li><a href="/logout"><%= t('layout.logout') %></a></li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<li><a href="/feeds/import"><%= t('layout.import') %></a></li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<li><a href="/feeds/export"><%= t('layout.export') %></a></li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<li>
<a href="#shortcuts" data-toggle="modal" aria-label="shortcuts">
<i aria-hidden="true" class="icon-keyboard">
</i>
</a>
</li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<li><%= link_to(t('layout.profile'), edit_profile_path) %></li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<% if current_user.admin? %>
<li><%= link_to(t('layout.admin_settings'), settings_path) %></li>
<li class="muted">·</li>
<li class="text-muted">·</li>
<% end %>
<% end %>

<li><a href="https://github.com/stringer-rss/stringer"><%= t('layout.support') %></a></li>
</ul>
</div>
<div class="span4">
<div class="col-md-4">
<p class="pull-right">
<b><%= t('layout.hey') %></b> <%= t('layout.back_to_work') %>
</p>
Expand Down
48 changes: 26 additions & 22 deletions app/views/layouts/_shortcuts.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
<div id="shortcuts" class="modal hide fade" tabindex="-1" role="dialog">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="myModalLabel"><%= t('partials.shortcuts.title') %></h3>
</div>
<div class="modal-body">
<ul class="shortcut-legend">
<li><kbd>j</kbd>/<kbd>k</kbd>: <%= t('partials.shortcuts.keys.jk') %></li>
<li><kbd>n</kbd>/<kbd>p</kbd>: <%= t('partials.shortcuts.keys.np') %></li>
<li><kbd>o</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
<li><kbd>m</kbd>: <%= t('partials.shortcuts.keys.m') %></li>
<li><kbd>s</kbd>: <%= t('partials.shortcuts.keys.s') %></li>
<li><kbd>b</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>v</kbd>: <%= t('partials.shortcuts.keys.bv') %></li>
<li class="blank"></li>
<li><kbd>a</kbd>: <%= t('partials.shortcuts.keys.a') %></li>
<li><kbd>shift</kbd>+<kbd>a</kbd>: <%= t('partials.shortcuts.keys.shifta') %></li>
<li><kbd>f</kbd>: <%= t('partials.shortcuts.keys.f') %></li>
<li><kbd>r</kbd>: <%= t('partials.shortcuts.keys.r') %></li>
<li class="blank"></li>
<li><kbd>&larr;</kbd>: <%= t('partials.shortcuts.keys.left') %></li>
<li><kbd>&rarr;</kbd>: <%= t('partials.shortcuts.keys.right') %></li>
</ul>
<div id="shortcuts" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 id="myModalLabel"><%= t('partials.shortcuts.title') %></h4>
</div>
<div class="modal-body">
<ul class="shortcut-legend">
<li><kbd>j</kbd>/<kbd>k</kbd>: <%= t('partials.shortcuts.keys.jk') %></li>
<li><kbd>n</kbd>/<kbd>p</kbd>: <%= t('partials.shortcuts.keys.np') %></li>
<li><kbd>o</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
<li><kbd>m</kbd>: <%= t('partials.shortcuts.keys.m') %></li>
<li><kbd>s</kbd>: <%= t('partials.shortcuts.keys.s') %></li>
<li><kbd>b</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>v</kbd>: <%= t('partials.shortcuts.keys.bv') %></li>
<li class="blank"></li>
<li><kbd>a</kbd>: <%= t('partials.shortcuts.keys.a') %></li>
<li><kbd>shift</kbd>+<kbd>a</kbd>: <%= t('partials.shortcuts.keys.shifta') %></li>
<li><kbd>f</kbd>: <%= t('partials.shortcuts.keys.f') %></li>
<li><kbd>r</kbd>: <%= t('partials.shortcuts.keys.r') %></li>
<li class="blank"></li>
<li><kbd>&larr;</kbd>: <%= t('partials.shortcuts.keys.left') %></li>
<li><kbd>&rarr;</kbd>: <%= t('partials.shortcuts.keys.right') %></li>
</ul>
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<%= render 'layouts/flash' %>
<%= render 'layouts/shortcuts' if current_user %>
<div class="container">
<div class="row-fluid">
<div class="span12">
<div class="row">
<div class="col-md-12">
<%= yield %>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/views/passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<p><%= t('first_run.password.description') %></p>
<hr />
<%= form_with(model: User.new, url: "/setup/password", id: "password_setup") do |form| %>
<div class="control-group">
<div class="form-group">
<%= form.text_field :username, class: "form-control", required: true %>
<%= form.label :username, t('first_run.password.fields.username'), class: "field-label" %>
</div>

<div class="control-group">
<div class="form-group">
<%= form.password_field :password, class: "form-control", required: true %>
<i class="icon-lock field-icon"></i>
<%= form.label :password, t('first_run.password.fields.password'), class: "field-label" %>
</div>

<div class="control-group">
<div class="form-group">
<%= form.password_field :password_confirmation, class: "form-control", required: true %>
<i class="icon-lock field-icon"></i>
<%= form.label :password_confirmation, t('first_run.password.fields.password_confirmation'), class: "field-label" %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/sessions/new.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<%= form_with(url: "/login") do |form| %>
<p><%= t('sessions.new.fields.unknown_username_html') %></p>
<div class="control-group">
<div class="form-group">
<%= form.text_field :username, class: "form-control", required: true %>
<%= form.label :username, t('sessions.new.fields.username'), class: "field-label" %>
</div>

<div class="control-group">
<div class="form-group">
<input name="password" class="form-control" id="password" type="password" required />
<i class="icon-lock field-icon"></i>
<label id="password-label" class="field-label" for="password"><%= t('sessions.new.fields.password') %></label>
Expand Down
2 changes: 1 addition & 1 deletion app/views/settings/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<hr />
<p><%= t('.description') %></p>
<hr />
<div class="control-group">
<div class="form-group">
<% setting = Setting::UserSignup.first %>
<%= form_with(model: setting, scope: :setting, url: setting_path(setting)) do |form| %>
<% if Setting::UserSignup.enabled? %>
Expand Down
10 changes: 5 additions & 5 deletions app/views/stories/_templates.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script type="text/template" id="story-template">
<div class="row-fluid story-preview">
<div class="span3">
<div class="row story-preview">
<div class="col-md-3">
<div class="story-starred">
<i class="icon-star{{ if(!is_starred) { }}-empty{{ } }}"></i>
</div>
<p class="blog-title">
{{= source }}
</p>
</div>
<div class="span9">
<div class="col-md-9">
<p class="story-details">
<span class="story-title">
{{= headline }}
Expand All @@ -20,7 +20,7 @@
</div>
</div>

<div class="story-body-container" class="row-fluid">
<div class="story-body-container">
<div class="story-body">
<h1>
<a href="{{= permalink }}">{{= title }}</a>
Expand All @@ -32,7 +32,7 @@
</h1>
{{= body }}
</div>
<div class="row-fluid story-actions-container">
<div class="row story-actions-container">
<div class="pull-left">
<span class="story-published">
{{= pretty_date }}
Expand Down
2 changes: 2 additions & 0 deletions config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# Add additional assets to the asset load path.
Rails.application.config.assets.paths += [
Rails.root.join("node_modules/backbone"),
Rails.root.join("node_modules/bootstrap/dist/js"),
Rails.root.join("node_modules/bootstrap/dist/css"),
Rails.root.join("node_modules/jquery"),
Rails.root.join("node_modules/mousetrap"),
Rails.root.join("node_modules/underscore"),
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
},
"dependencies": {
"backbone": "1.0.0",
"bootstrap": "3.1.1",
"jquery": "1.9.1",
"jquery-visible": "1.2.0",
"mousetrap": "1.4.6",
Expand Down
Loading