Skip to content
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.

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

Admin cleanup #1339

Merged
merged 18 commits into from
Jan 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ exclude_paths:
- "spec/"
- "lib/alchemy/upgrader/"
- "lib/rails/"
- "vendor/assets/"
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ cache:
directories:
- "travis_phantomjs"
rvm:
- 2.2.7
- 2.3.5
- 2.4.2
- 2.5.0
before_install:
- "phantomjs --version"
- "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 4.1.0 (unreleased)

* Removed fixed table headers from admin resource tables [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)
* Removed Bourbon Sass library [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)

## 4.0.0 (2017-11-06)

* Fixes image cropping issues [#1320](https://github.com/AlchemyCMS/alchemy_cms/pull/1320) and [#1321](https://github.com/AlchemyCMS/alchemy_cms/pull/1321) by [tvdeyen](https://github.com/tvdeyen)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
[![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
[![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
[![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
[![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
[![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)

**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.0-stable).**
Expand Down
1 change: 0 additions & 1 deletion alchemy_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency 'acts_as_list', ['~> 0.3']
gem.add_runtime_dependency 'acts-as-taggable-on', ['~> 5.0']
gem.add_runtime_dependency 'awesome_nested_set', ['~> 3.1']
gem.add_runtime_dependency 'bourbon', ['~> 4.2']
gem.add_runtime_dependency 'cancancan', ['~> 1.9']
gem.add_runtime_dependency 'coffee-rails', ['~> 4.0']
gem.add_runtime_dependency 'dragonfly', ['~> 1.0', '>= 1.0.7']
Expand Down
Binary file removed app/assets/images/sassy-ie-overlay.png
Binary file not shown.
6 changes: 0 additions & 6 deletions app/assets/javascripts/alchemy/alchemy.initializer.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ Alchemy.Initializer = ->
tagName = (event.target || event.srcElement).tagName
key.isPressed('esc') || !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA')

# Sticky table headers
$('table.list').floatThead
useAbsolutePositioning: false,
scrollingTop: 122,
zIndex: 1

# Enabling the Turbolinks Progress Bar for v2.5
Turbolinks.enableProgressBar() if Turbolinks.enableProgressBar

Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/alchemy/_defaults.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "bourbon";
@import "alchemy/variables";
@import "alchemy/mixins";
@import "alchemy/extends";
Expand Down
6 changes: 1 addition & 5 deletions app/assets/stylesheets/alchemy/_extends.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
%rounded-border {
border-radius: $default-border-radius;
}

%text-overflow {
white-space: nowrap;
overflow: hidden;
Expand Down Expand Up @@ -33,7 +29,7 @@
}

%default-input-style {
@extend %rounded-border;
border-radius: $default-border-radius;
box-shadow: inset 0px 1px 1px $medium-gray;
font: $default-font-style;
padding: 1px 2*$default-padding;
Expand Down
34 changes: 31 additions & 3 deletions app/assets/stylesheets/alchemy/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
line-height: 21px;
min-height: $default-form-field-height;
background: white;
@extend %rounded-border;
border-radius: $default-border-radius;
}

@mixin form-hint($background-color: $light_yellow, $border-color: $medium-gray) {
Expand All @@ -114,7 +114,7 @@
border: 1px solid $border-color;
display: block;
clear: both;
@extend %rounded-border;
border-radius: $default-border-radius;
}

@mixin animate-left {
Expand Down Expand Up @@ -150,7 +150,7 @@
background-color: $medium-gray;
overflow: hidden;
position: relative;
@extend %rounded-border;
border-radius: $default-border-radius;

&:before {
position: absolute;
Expand Down Expand Up @@ -193,3 +193,31 @@
opacity: 1;
transition-delay: .2s;
}

@mixin clearfix {
&::after {
clear: both;
content: "";
display: table;
}
}

@mixin border-top-radius($radius) {
border-top-left-radius: $radius;
border-top-right-radius: $radius;
}

@mixin border-bottom-radius($radius) {
border-bottom-left-radius: $radius;
border-bottom-right-radius: $radius;
}

@mixin border-left-radius($radius) {
border-bottom-left-radius: $radius;
border-top-left-radius: $radius;
}

@mixin border-right-radius($radius) {
border-bottom-right-radius: $radius;
border-top-right-radius: $radius;
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/alchemy/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@import "alchemy/buttons";
@import "alchemy/dialogs";
@import "alchemy/toolbar";
@import "alchemy/clipboard";
@import "alchemy/dashboard";
@import "alchemy/elements";
@import "alchemy/errors";
Expand All @@ -25,12 +26,14 @@
@import "alchemy/modules";
@import "alchemy/notices";
@import "alchemy/pagination";
@import "alchemy/preview_window";
@import "alchemy/resource_info";
@import "alchemy/search";
@import "alchemy/selects";
@import "alchemy/sitemap";
@import "alchemy/spinner";
@import "alchemy/tables";
@import "alchemy/trash";
@import "alchemy/lists";
@import "alchemy/upload";
@import "alchemy/jquery-ui";
Expand Down
8 changes: 6 additions & 2 deletions app/assets/stylesheets/alchemy/archive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ div#image_assign_filter_and_image_sizing {
display: inline-block;
border: 1px solid #c0c0c0;
position: relative;
@extend %rounded-border;
border-radius: $default-border-radius;
width: 170px;

img {
Expand Down Expand Up @@ -328,7 +328,7 @@ div#filter_bar {
.tag {
display: inline-block;
vertical-align: middle;
@extend %rounded-border;
border-radius: $default-border-radius;
padding: $default-padding 2*$default-padding $default-padding 4*$default-padding;
margin: $default-margin/2 0;
background-color: rgba($medium-gray, 0.85);
Expand All @@ -351,3 +351,7 @@ div#filter_bar {
.tags .list .tag {
padding: 0;
}

#all_files td.name a {
@include zoom-in;
}
Loading