Merge pull request #24 from Tripwire/menutabs

Menutabs
Tripwire · Mar 2, 2017 · e7c6ef4 · e7c6ef4
2 parents a3be742 + c8c98b6
commit e7c6ef4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/semantic/src/theme.config b/semantic/src/theme.config
@@ -42,7 +42,7 @@
 @breadcrumb : 'default';
 @form       : 'default';
 @grid       : 'default';
-@menu       : 'default';
+@menu       : 'tripwire';
 @message    : 'tripwire';
 @table      : 'tripwire';
 
@@ -52,7 +52,7 @@
 @dimmer     : 'default';
 @dropdown   : 'tripwire';
 @embed      : 'default';
-@modal      : 'default';
+@modal      : 'tripwire';
 @nag        : 'default';
 @popup      : 'tripwire';
 @progress   : 'tripwire';

diff --git a/semantic/src/themes/tripwire/collections/menu.variables b/semantic/src/themes/tripwire/collections/menu.variables
@@ -313,20 +313,20 @@
 @tabularOppositeBorderWidth: @tabularBorderWidth + 1px;
 @tabularVerticalPadding: @itemVerticalPadding;
 @tabularHorizontalPadding: @relativeHuge;
-@tabularBorderRadius: @defaultBorderRadius;
+@tabularBorderRadius: 0px;
 @tabularTextColor: @itemTextColor;
 
-@tabularHoveredTextColor: @hoveredTextColor;
+@tabularHoveredTextColor: @blue;
 
 @tabularVerticalBackground: none @tabularBackgroundColor;
 
 @tabularFluidOffset: 1px;
 @tabularFluidWidth: ~"calc(100% + "(@tabularFluidOffset * 2)~")";
 
 @tabularActiveBackground: none @white;
-@tabularActiveColor: @selectedTextColor;
+@tabularActiveColor: @grey;
 @tabularActiveBoxShadow: none;
-@tabularActiveWeight: bold;
+@tabularActiveWeight: normal;
 
 
 

diff --git a/semantic/src/themes/tripwire/modules/modal.variables b/semantic/src/themes/tripwire/modules/modal.variables
@@ -5,7 +5,7 @@
 @background: @white;
 @border: none;
 @zIndex: 1001;
-@borderRadius: @defaultBorderRadius;
+@borderRadius: 0px;
 @transformOrigin: 50% 25%;
 @boxShadow:
   1px 3px 3px 0px rgba(0, 0, 0, 0.2),

diff --git a/stories/controls.stories.js b/stories/controls.stories.js
@@ -39,6 +39,7 @@ const paginationSampleData = [
 function nextPage () {
   // handle your pagination
 }
+
 storiesOf('Interactive Controls', module)
   .addDecorator((story) => (
     <div style={{marginTop: '15px', marginLeft: '15px'}}>

diff --git a/stories/menutabs.stories.js b/stories/menutabs.stories.js
@@ -0,0 +1,18 @@
+import React from 'react'
+import { storiesOf } from '@kadira/storybook'
+import { Menu, Segment } from 'semantic-ui-react'
+
+storiesOf('Menu', module)
+
+    .add('Tabs', () => (
+      <div>
+        <Menu attached='top' tabular>
+          <Menu.Item name='First' active />
+          <Menu.Item name='Second' />
+          <Menu.Item name='Third' />
+        </Menu>
+        <Segment attached='bottom'>
+          <img src='http://semantic-ui.com/images/wireframe/paragraph.png' />
+        </Segment>
+      </div>
+    ))