Skip to content

Commit

Permalink
Remove extraeous css.scss suffixes
Browse files Browse the repository at this point in the history
  • Loading branch information
massive committed Apr 21, 2016
1 parent 5688107 commit 6557de2
Show file tree
Hide file tree
Showing 59 changed files with 47 additions and 47 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'mixins.css.scss';
@import 'mixins.scss';

// This is outside the form-view element, so we can't use it as parent selector
.flame-form-view-validation-error {
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/flame.css.scss → stylesheets/flame.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "reset.css";
@import "mixins.css.scss";
@import "mixins.scss";

body {
font-size: $default-font-size;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../mixins.css.scss";
@import "../mixins.scss";

.flame-button-view {
border: 1px solid #999;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-button-view.flame-checkbox-view {
@include no-gradient();
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-combo-box-view {
background: none;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-lazy-list-view {
overflow: visible;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-list-view {
& .flame-list-item-view.is-selected,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-menu {
font-size: 12px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-panel {
border: 1px solid #888;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-popover {
@include no-gradient();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-progress-view {
.progress-container {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-checkbox-view.flame-radio-button-view {
.flame-checkbox-box {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-select-button-view {
label {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-vertical-split-view > .flame-split-view-divider {
border-style: none solid;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-tab-view-tabs .flame-button-view {
position: static;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-table-view {
line-height: normal;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../mixins.css.scss';
@import '../mixins.scss';

.flame-text {
overflow: visible;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion views/alert_panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import VerticalStackLayoutManager from '../layout_managers/vertical_stack_layout
import { nearest } from '../utils/computed_nearest';
import { measureString } from '../utils/string_measurement';

import '../stylesheets/views/alert_panel.css.scss';
import '../stylesheets/views/alert_panel.scss';

const { alias } = Ember.computed;

Expand Down
2 changes: 1 addition & 1 deletion views/button_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import View from '../view';
import ActionSupport from '../mixins/action_support';
import Statechart, { State } from '../statechart';

import '../stylesheets/views/button_view.css.scss';
import '../stylesheets/views/button_view.scss';

export default View.extend(ActionSupport, Statechart, {
defaultHeight: 24,
Expand Down
2 changes: 1 addition & 1 deletion views/checkbox_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ButtonView from './button_view';

import '../stylesheets/views/checkbox_view.css.scss';
import '../stylesheets/views/checkbox_view.scss';

import imgUrl from 'lib/flame/images/checkmark.svg';

Expand Down
2 changes: 1 addition & 1 deletion views/collection_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ViewSupport from '../mixins/view_support';
import LayoutSupport from '../mixins/layout_support';
import EventManager from '../mixins/event_manager';

import '../stylesheets/views/collection_view.css.scss';
import '../stylesheets/views/collection_view.scss';

export default Ember.CollectionView.extend(ViewSupport, LayoutSupport, EventManager, {
classNames: ['flame-collection-view']
Expand Down
2 changes: 1 addition & 1 deletion views/combo_box_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import ButtonView from './button_view';
import SelectButtonView from './select_button_view';
import TextFieldView from './text_field_view';

import '../stylesheets/views/combo_box_view.css.scss';
import '../stylesheets/views/combo_box_view.scss';

import selectButtonArrow from 'lib/flame/images/select_button_arrow.svg';

Expand Down
2 changes: 1 addition & 1 deletion views/disclosure_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LabelView from './label_view';

import '../stylesheets/views/disclosure_view.css.scss';
import '../stylesheets/views/disclosure_view.scss';

import triangleDown from 'lib/flame/images/disclosure_triangle_down.svg';
import triangleRight from 'lib/flame/images/disclosure_triangle_right.svg';
Expand Down
2 changes: 1 addition & 1 deletion views/error_message_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LabelView, { ALIGN_LEFT, ALIGN_RIGHT } from './label_view';

import '../stylesheets/error_message.css.scss';
import '../stylesheets/error_message.scss';

export default LabelView.extend({
classNames: ['flame-form-view-validation-error'],
Expand Down
2 changes: 1 addition & 1 deletion views/form_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { keyResponderStack } from '../mixins/event_manager';
import { nearest } from '../utils/computed_nearest';
import { notEqual } from '../utils/computed';

import '../stylesheets/views/form_view.css.scss';
import '../stylesheets/views/form_view.scss';

// You must set on object to 'object' that the form manipulates (or use a binding)
// Optionally you can set a defaultTarget, that will be used to set the default target for any actions
Expand Down
2 changes: 1 addition & 1 deletion views/label_view.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "../stylesheets/views/label_view.css.scss";
import "../stylesheets/views/label_view.scss";

import View from '../view';
import ActionSupport from '../mixins/action_support';
Expand Down
2 changes: 1 addition & 1 deletion views/lazy_list_item_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Statechart, { State } from '../statechart';
import '../utils/jquery_util';

import reorderIndicator from 'lib/flame/images/reorder_indicator.svg';
import '../stylesheets/views/lazy_list_view.css.scss';
import '../stylesheets/views/lazy_list_view.scss';

export const MouseIsDownState = State.extend({
xOffset: null,
Expand Down
2 changes: 1 addition & 1 deletion views/lazy_tree_item_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import LazyListItemView, { MouseIsDownState } from './lazy_list_item_view';

import '../stylesheets/views/lazy_tree_item_view.css.scss';
import '../stylesheets/views/lazy_tree_item_view.scss';

import triangleDown from 'lib/flame/images/disclosure_triangle_down.svg';
import triangleRight from 'lib/flame/images/disclosure_triangle_right.svg';
Expand Down
2 changes: 1 addition & 1 deletion views/list_item_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import View from '../view';

import '../stylesheets/views/list_item_view.css.scss';
import '../stylesheets/views/list_item_view.scss';

export default View.extend({
useAbsolutePosition: false,
Expand Down
2 changes: 1 addition & 1 deletion views/list_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ListItemView from './list_item_view';
import ListViewDragHelper from './list_view_drag_helper';
import Statechart, { State } from '../statechart';

import '../stylesheets/views/list_view.css.scss';
import '../stylesheets/views/list_view.scss';

/**
Displays a list of items. Allows reordering if allowReordering is true.
Expand Down
4 changes: 2 additions & 2 deletions views/menu_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import MenuViewSupport from '../mixins/menu_view_support';

// We need to import list item view css before menu view's because otherwise menu view's css will
// override some list view's styles
import '../stylesheets/views/list_item_view.css.scss';
import '../stylesheets/views/menu_view.css.scss';
import '../stylesheets/views/list_item_view.scss';
import '../stylesheets/views/menu_view.scss';

// Only to be used in MenuView. Represent menu items with normal JS objects as creation of one Ember object took
// 3.5 ms on fast IE8 machine.
Expand Down
2 changes: 1 addition & 1 deletion views/multiselection_menu_view.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'stylesheets/app/multi-select.css.scss';
import 'stylesheets/app/multi-select.scss';

import View from '../view';
import Panel from './panel';
Expand Down
2 changes: 1 addition & 1 deletion views/panel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../stylesheets/views/panel.css.scss';
import '../stylesheets/views/panel.scss';

import View from '../view';
import Statechart, { State } from '../statechart';
Expand Down
2 changes: 1 addition & 1 deletion views/popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import arrowLeft from 'lib/flame/images/arrow_left.png';
import arrowDown from 'lib/flame/images/arrow_down.png';
import arrowRight from 'lib/flame/images/arrow_right.png';

import '../stylesheets/views/popover.css.scss';
import '../stylesheets/views/popover.scss';

/**
Popover provides a means to display a popup in the context of an existing element in the UI.
Expand Down
2 changes: 1 addition & 1 deletion views/progress_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import View from '../view';

import '../stylesheets/views/progress_view.css.scss';
import '../stylesheets/views/progress_view.scss';

export default View.extend({
classNames: ['flame-progress-view'],
Expand Down
2 changes: 1 addition & 1 deletion views/radio_button_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import CheckboxView from './checkbox_view';

import '../stylesheets/views/radio_button_view.css.scss';
import '../stylesheets/views/radio_button_view.scss';

export default CheckboxView.extend({
classNames: ['flame-radio-button-view'],
Expand Down
2 changes: 1 addition & 1 deletion views/scroll_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import View from '../view';

import '../stylesheets/views/scroll_view.css.scss';
import '../stylesheets/views/scroll_view.scss';

/**
ScrollView provides a scrollable container. In the DOM this is just a div
Expand Down
2 changes: 1 addition & 1 deletion views/search_text_field_view.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import TextFieldView from './text_field_view';
import ButtonView from './button_view';

import '../stylesheets/views/search_text_field_view.css.scss';
import '../stylesheets/views/search_text_field_view.scss';

import searchClear from 'lib/flame/images/search_clear.svg';

Expand Down
2 changes: 1 addition & 1 deletion views/select_button_view.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ButtonView from './button_view';
import MenuView from './menu_view';

import '../stylesheets/views/select_button_view.css.scss';
import '../stylesheets/views/select_button_view.scss';
import selectButtonArrow from 'lib/flame/images/select_button_arrow.svg';

export default ButtonView.extend({
Expand Down
2 changes: 1 addition & 1 deletion views/split_view.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import View from '../view';
import SplitViewDividerViewBase from './split_view_divider_view_base';

import '../stylesheets/views/split_view.css.scss';
import '../stylesheets/views/split_view.scss';

export default View.extend({
allowResizing: true,
Expand Down
2 changes: 1 addition & 1 deletion views/stack_item_view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ListItemView from './list_item_view';

import '../stylesheets/views/stack_item_view.css.scss';
import '../stylesheets/views/stack_item_view.scss';

export default ListItemView.extend({
useAbsolutePosition: true,
Expand Down
2 changes: 1 addition & 1 deletion views/tab_view.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import View from '../view';
import ButtonView from './button_view';

import '../stylesheets/views/tab_view.css.scss';
import '../stylesheets/views/tab_view.scss';

export default View.extend({
classNames: ['flame-tab-view'],
Expand Down
2 changes: 1 addition & 1 deletion views/table_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import TableViewContentAdapter from '../utils/table_view_content_adapter';
import Statechart, { State } from '../statechart';
import { measureString } from '../utils/string_measurement';

import '../stylesheets/views/table_view.css.scss';
import '../stylesheets/views/table_view.scss';

const { alias, readOnly } = Ember.computed;

Expand Down
2 changes: 1 addition & 1 deletion views/text_field_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import EventManager, { ALLOW_BROWSER_DEFAULT_HANDLING } from '../mixins/event_ma
import FocusSupport from '../mixins/focus_support';
import { trueFalse } from '../utils/computed';

import '../stylesheets/views/text_field_view.css.scss';
import '../stylesheets/views/text_field_view.scss';

const { alias, equal } = Ember.computed;

Expand Down
2 changes: 1 addition & 1 deletion views/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import LabelView, { ALIGN_CENTER } from './label_view';
import Popover from './popover';
import { measureString } from '../utils/string_measurement';

import '../stylesheets/views/tooltip.css.scss';
import '../stylesheets/views/tooltip.scss';

export default Popover.extend({
layout: { height: 25, width: 200 },
Expand Down
2 changes: 1 addition & 1 deletion views/tree_item_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ListItemView from './list_item_view';
import DisclosureView from './disclosure_view';
import VerticalStackLayoutManager from '../layout_managers/vertical_stack_layout_manager';

import '../stylesheets/views/tree_item_view.css.scss';
import '../stylesheets/views/tree_item_view.scss';

/*
A child view in a TreeView. In most cases you don't need to extend this, you can instead define
Expand Down

0 comments on commit 6557de2

Please sign in to comment.